diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218B10_43A5A0.s b/asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218B10_43A5A0.s deleted file mode 100644 index ef446b14f8..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218B10_43A5A0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218B10_43A5A0 -/* 43A5A0 80218B10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 43A5A4 80218B14 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 43A5A8 80218B18 4485A000 */ mtc1 $a1, $f20 -/* 43A5AC 80218B1C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 43A5B0 80218B20 4486B000 */ mtc1 $a2, $f22 -/* 43A5B4 80218B24 AFB00010 */ sw $s0, 0x10($sp) -/* 43A5B8 80218B28 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 43A5BC 80218B2C 4487C000 */ mtc1 $a3, $f24 -/* 43A5C0 80218B30 AFBF0014 */ sw $ra, 0x14($sp) -/* 43A5C4 80218B34 0C019D28 */ jal guMtxIdentF -/* 43A5C8 80218B38 0080802D */ daddu $s0, $a0, $zero -/* 43A5CC 80218B3C 4616A582 */ mul.s $f22, $f20, $f22 -/* 43A5D0 80218B40 00000000 */ nop -/* 43A5D4 80218B44 4618A502 */ mul.s $f20, $f20, $f24 -/* 43A5D8 80218B48 00000000 */ nop -/* 43A5DC 80218B4C 3C013F80 */ lui $at, 0x3f80 -/* 43A5E0 80218B50 44810000 */ mtc1 $at, $f0 -/* 43A5E4 80218B54 00000000 */ nop -/* 43A5E8 80218B58 E6000014 */ swc1 $f0, 0x14($s0) -/* 43A5EC 80218B5C E6160010 */ swc1 $f22, 0x10($s0) -/* 43A5F0 80218B60 E6140018 */ swc1 $f20, 0x18($s0) -/* 43A5F4 80218B64 8FBF0014 */ lw $ra, 0x14($sp) -/* 43A5F8 80218B68 8FB00010 */ lw $s0, 0x10($sp) -/* 43A5FC 80218B6C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 43A600 80218B70 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 43A604 80218B74 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 43A608 80218B78 03E00008 */ jr $ra -/* 43A60C 80218B7C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218B80_43A610.s b/asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218B80_43A610.s deleted file mode 100644 index f546081fc8..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218B80_43A610.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218B80_43A610 -/* 43A610 80218B80 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 43A614 80218B84 AFB10054 */ sw $s1, 0x54($sp) -/* 43A618 80218B88 0080882D */ daddu $s1, $a0, $zero -/* 43A61C 80218B8C AFBF005C */ sw $ra, 0x5c($sp) -/* 43A620 80218B90 AFB20058 */ sw $s2, 0x58($sp) -/* 43A624 80218B94 AFB00050 */ sw $s0, 0x50($sp) -/* 43A628 80218B98 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 43A62C 80218B9C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 43A630 80218BA0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 43A634 80218BA4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 43A638 80218BA8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 43A63C 80218BAC 8E30000C */ lw $s0, 0xc($s1) -/* 43A640 80218BB0 8E050000 */ lw $a1, ($s0) -/* 43A644 80218BB4 0C0B1EAF */ jal get_variable -/* 43A648 80218BB8 26100004 */ addiu $s0, $s0, 4 -/* 43A64C 80218BBC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 43A650 80218BC0 0040202D */ daddu $a0, $v0, $zero -/* 43A654 80218BC4 8E050000 */ lw $a1, ($s0) -/* 43A658 80218BC8 26100004 */ addiu $s0, $s0, 4 -/* 43A65C 80218BCC 0220202D */ daddu $a0, $s1, $zero -/* 43A660 80218BD0 0C0B210B */ jal get_float_variable -/* 43A664 80218BD4 0040902D */ daddu $s2, $v0, $zero -/* 43A668 80218BD8 8E050000 */ lw $a1, ($s0) -/* 43A66C 80218BDC 26100004 */ addiu $s0, $s0, 4 -/* 43A670 80218BE0 0220202D */ daddu $a0, $s1, $zero -/* 43A674 80218BE4 0C0B210B */ jal get_float_variable -/* 43A678 80218BE8 46000706 */ mov.s $f28, $f0 -/* 43A67C 80218BEC 8E050000 */ lw $a1, ($s0) -/* 43A680 80218BF0 26100004 */ addiu $s0, $s0, 4 -/* 43A684 80218BF4 0220202D */ daddu $a0, $s1, $zero -/* 43A688 80218BF8 0C0B210B */ jal get_float_variable -/* 43A68C 80218BFC 46000686 */ mov.s $f26, $f0 -/* 43A690 80218C00 0220202D */ daddu $a0, $s1, $zero -/* 43A694 80218C04 8E050000 */ lw $a1, ($s0) -/* 43A698 80218C08 0C0B210B */ jal get_float_variable -/* 43A69C 80218C0C 46000586 */ mov.s $f22, $f0 -/* 43A6A0 80218C10 0240202D */ daddu $a0, $s2, $zero -/* 43A6A4 80218C14 0C046B4C */ jal get_model_from_list_index -/* 43A6A8 80218C18 46000606 */ mov.s $f24, $f0 -/* 43A6AC 80218C1C 0040882D */ daddu $s1, $v0, $zero -/* 43A6B0 80218C20 96220000 */ lhu $v0, ($s1) -/* 43A6B4 80218C24 30420400 */ andi $v0, $v0, 0x400 -/* 43A6B8 80218C28 1440001E */ bnez $v0, .L80218CA4 -/* 43A6BC 80218C2C 26300058 */ addiu $s0, $s1, 0x58 -/* 43A6C0 80218C30 4480A000 */ mtc1 $zero, $f20 -/* 43A6C4 80218C34 4406B000 */ mfc1 $a2, $f22 -/* 43A6C8 80218C38 4405A000 */ mfc1 $a1, $f20 -/* 43A6CC 80218C3C 4407A000 */ mfc1 $a3, $f20 -/* 43A6D0 80218C40 0C019E40 */ jal guTranslateF -/* 43A6D4 80218C44 0200202D */ daddu $a0, $s0, $zero -/* 43A6D8 80218C48 4405E000 */ mfc1 $a1, $f28 -/* 43A6DC 80218C4C 4406D000 */ mfc1 $a2, $f26 -/* 43A6E0 80218C50 4407C000 */ mfc1 $a3, $f24 -/* 43A6E4 80218C54 0C0862C4 */ jal func_80218B10_43A5A0 -/* 43A6E8 80218C58 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A6EC 80218C5C 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A6F0 80218C60 0200282D */ daddu $a1, $s0, $zero -/* 43A6F4 80218C64 0C019D80 */ jal guMtxCatF -/* 43A6F8 80218C68 0200302D */ daddu $a2, $s0, $zero -/* 43A6FC 80218C6C 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A700 80218C70 4600B587 */ neg.s $f22, $f22 -/* 43A704 80218C74 4405A000 */ mfc1 $a1, $f20 -/* 43A708 80218C78 4406B000 */ mfc1 $a2, $f22 -/* 43A70C 80218C7C 0C019E40 */ jal guTranslateF -/* 43A710 80218C80 00A0382D */ daddu $a3, $a1, $zero -/* 43A714 80218C84 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A718 80218C88 0200282D */ daddu $a1, $s0, $zero -/* 43A71C 80218C8C 0C019D80 */ jal guMtxCatF -/* 43A720 80218C90 00A0302D */ daddu $a2, $a1, $zero -/* 43A724 80218C94 96220000 */ lhu $v0, ($s1) -/* 43A728 80218C98 34421400 */ ori $v0, $v0, 0x1400 -/* 43A72C 80218C9C 08086347 */ j .L80218D1C -/* 43A730 80218CA0 A6220000 */ sh $v0, ($s1) -.L80218CA4: -/* 43A734 80218CA4 4480A000 */ mtc1 $zero, $f20 -/* 43A738 80218CA8 4406B000 */ mfc1 $a2, $f22 -/* 43A73C 80218CAC 4405A000 */ mfc1 $a1, $f20 -/* 43A740 80218CB0 4407A000 */ mfc1 $a3, $f20 -/* 43A744 80218CB4 0C019E40 */ jal guTranslateF -/* 43A748 80218CB8 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A74C 80218CBC 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A750 80218CC0 26300058 */ addiu $s0, $s1, 0x58 -/* 43A754 80218CC4 0200282D */ daddu $a1, $s0, $zero -/* 43A758 80218CC8 0C019D80 */ jal guMtxCatF -/* 43A75C 80218CCC 0200302D */ daddu $a2, $s0, $zero -/* 43A760 80218CD0 4405E000 */ mfc1 $a1, $f28 -/* 43A764 80218CD4 4406D000 */ mfc1 $a2, $f26 -/* 43A768 80218CD8 4407C000 */ mfc1 $a3, $f24 -/* 43A76C 80218CDC 0C0862C4 */ jal func_80218B10_43A5A0 -/* 43A770 80218CE0 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A774 80218CE4 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A778 80218CE8 0200282D */ daddu $a1, $s0, $zero -/* 43A77C 80218CEC 0C019D80 */ jal guMtxCatF -/* 43A780 80218CF0 0200302D */ daddu $a2, $s0, $zero -/* 43A784 80218CF4 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A788 80218CF8 4600B587 */ neg.s $f22, $f22 -/* 43A78C 80218CFC 4405A000 */ mfc1 $a1, $f20 -/* 43A790 80218D00 4406B000 */ mfc1 $a2, $f22 -/* 43A794 80218D04 0C019E40 */ jal guTranslateF -/* 43A798 80218D08 00A0382D */ daddu $a3, $a1, $zero -/* 43A79C 80218D0C 27A40010 */ addiu $a0, $sp, 0x10 -/* 43A7A0 80218D10 0200282D */ daddu $a1, $s0, $zero -/* 43A7A4 80218D14 0C019D80 */ jal guMtxCatF -/* 43A7A8 80218D18 00A0302D */ daddu $a2, $a1, $zero -.L80218D1C: -/* 43A7AC 80218D1C 8FBF005C */ lw $ra, 0x5c($sp) -/* 43A7B0 80218D20 8FB20058 */ lw $s2, 0x58($sp) -/* 43A7B4 80218D24 8FB10054 */ lw $s1, 0x54($sp) -/* 43A7B8 80218D28 8FB00050 */ lw $s0, 0x50($sp) -/* 43A7BC 80218D2C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 43A7C0 80218D30 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 43A7C4 80218D34 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 43A7C8 80218D38 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 43A7CC 80218D3C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 43A7D0 80218D40 24020002 */ addiu $v0, $zero, 2 -/* 43A7D4 80218D44 03E00008 */ jr $ra -/* 43A7D8 80218D48 27BD0088 */ addiu $sp, $sp, 0x88 -/* 43A7DC 80218D4C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218D50_43A7E0.s b/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s similarity index 88% rename from asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218D50_43A7E0.s rename to asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s index 26cf5e4daf..4c652965dd 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/43A5A0/func_80218D50_43A7E0.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s @@ -21,7 +21,7 @@ glabel func_80218D50_43A7E0 /* 43A820 80218D90 0C0B1EAF */ jal get_variable /* 43A824 80218D94 26100004 */ addiu $s0, $s0, 4 /* 43A828 80218D98 44820000 */ mtc1 $v0, $f0 -/* 43A82C 80218D9C 00000000 */ nop +/* 43A82C 80218D9C 00000000 */ nop /* 43A830 80218DA0 46800021 */ cvt.d.w $f0, $f0 /* 43A834 80218DA4 8E110000 */ lw $s1, ($s0) /* 43A838 80218DA8 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218D50_43A7E0 /* 43A858 80218DC8 46220003 */ div.d $f0, $f0, $f2 /* 43A85C 80218DCC 462007A0 */ cvt.s.d $f30, $f0 /* 43A860 80218DD0 4614F502 */ mul.s $f20, $f30, $f20 -/* 43A864 80218DD4 00000000 */ nop +/* 43A864 80218DD4 00000000 */ nop /* 43A868 80218DD8 26100004 */ addiu $s0, $s0, 4 /* 43A86C 80218DDC 8E120000 */ lw $s2, ($s0) /* 43A870 80218DE0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218D50_43A7E0 /* 43A884 80218DF4 4600A306 */ mov.s $f12, $f20 /* 43A888 80218DF8 3C014100 */ lui $at, 0x4100 /* 43A88C 80218DFC 44816000 */ mtc1 $at, $f12 -/* 43A890 80218E00 00000000 */ nop +/* 43A890 80218E00 00000000 */ nop /* 43A894 80218E04 460CA302 */ mul.s $f12, $f20, $f12 -/* 43A898 80218E08 00000000 */ nop +/* 43A898 80218E08 00000000 */ nop /* 43A89C 80218E0C 3C014316 */ lui $at, 0x4316 /* 43A8A0 80218E10 4481E000 */ mtc1 $at, $f28 -/* 43A8A4 80218E14 00000000 */ nop +/* 43A8A4 80218E14 00000000 */ nop /* 43A8A8 80218E18 461C0582 */ mul.s $f22, $f0, $f28 -/* 43A8AC 80218E1C 00000000 */ nop +/* 43A8AC 80218E1C 00000000 */ nop /* 43A8B0 80218E20 4480D000 */ mtc1 $zero, $f26 /* 43A8B4 80218E24 0C00A85B */ jal sin_rad /* 43A8B8 80218E28 461AB580 */ add.s $f22, $f22, $f26 /* 43A8BC 80218E2C 3C014120 */ lui $at, 0x4120 /* 43A8C0 80218E30 44811000 */ mtc1 $at, $f2 -/* 43A8C4 80218E34 00000000 */ nop +/* 43A8C4 80218E34 00000000 */ nop /* 43A8C8 80218E38 46020602 */ mul.s $f24, $f0, $f2 -/* 43A8CC 80218E3C 00000000 */ nop +/* 43A8CC 80218E3C 00000000 */ nop /* 43A8D0 80218E40 4600A306 */ mov.s $f12, $f20 /* 43A8D4 80218E44 0C00A874 */ jal cos_rad /* 43A8D8 80218E48 461AC600 */ add.s $f24, $f24, $f26 /* 43A8DC 80218E4C 0280202D */ daddu $a0, $s4, $zero /* 43A8E0 80218E50 461C0502 */ mul.s $f20, $f0, $f28 -/* 43A8E4 80218E54 00000000 */ nop +/* 43A8E4 80218E54 00000000 */ nop /* 43A8E8 80218E58 0220282D */ daddu $a1, $s1, $zero /* 43A8EC 80218E5C 4406B000 */ mfc1 $a2, $f22 /* 43A8F0 80218E60 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218D50_43A7E0 /* 43A928 80218E98 0240282D */ daddu $a1, $s2, $zero /* 43A92C 80218E9C 3C0142B4 */ lui $at, 0x42b4 /* 43A930 80218EA0 44810000 */ mtc1 $at, $f0 -/* 43A934 80218EA4 00000000 */ nop +/* 43A934 80218EA4 00000000 */ nop /* 43A938 80218EA8 461E003C */ c.lt.s $f0, $f30 -/* 43A93C 80218EAC 00000000 */ nop +/* 43A93C 80218EAC 00000000 */ nop /* 43A940 80218EB0 4500000B */ bc1f .L80218EE0 /* 43A944 80218EB4 0000302D */ daddu $a2, $zero, $zero /* 43A948 80218EB8 3C014387 */ lui $at, 0x4387 /* 43A94C 80218EBC 44810000 */ mtc1 $at, $f0 -/* 43A950 80218EC0 00000000 */ nop +/* 43A950 80218EC0 00000000 */ nop /* 43A954 80218EC4 4600F03C */ c.lt.s $f30, $f0 -/* 43A958 80218EC8 00000000 */ nop +/* 43A958 80218EC8 00000000 */ nop /* 43A95C 80218ECC 45030001 */ bc1tl .L80218ED4 /* 43A960 80218ED0 240600B4 */ addiu $a2, $zero, 0xb4 .L80218ED4: /* 43A964 80218ED4 3C0142B4 */ lui $at, 0x42b4 /* 43A968 80218ED8 44810000 */ mtc1 $at, $f0 -/* 43A96C 80218EDC 00000000 */ nop +/* 43A96C 80218EDC 00000000 */ nop .L80218EE0: /* 43A970 80218EE0 461E0001 */ sub.s $f0, $f0, $f30 /* 43A974 80218EE4 46000005 */ abs.s $f0, $f0 /* 43A978 80218EE8 4600010D */ trunc.w.s $f4, $f0 /* 43A97C 80218EEC 44022000 */ mfc1 $v0, $f4 -/* 43A980 80218EF0 00000000 */ nop +/* 43A980 80218EF0 00000000 */ nop /* 43A984 80218EF4 2842002D */ slti $v0, $v0, 0x2d /* 43A988 80218EF8 10400008 */ beqz $v0, .L80218F1C -/* 43A98C 80218EFC 00000000 */ nop +/* 43A98C 80218EFC 00000000 */ nop /* 43A990 80218F00 3C014234 */ lui $at, 0x4234 /* 43A994 80218F04 44810000 */ mtc1 $at, $f0 -/* 43A998 80218F08 00000000 */ nop +/* 43A998 80218F08 00000000 */ nop /* 43A99C 80218F0C 4600F001 */ sub.s $f0, $f30, $f0 /* 43A9A0 80218F10 46000000 */ add.s $f0, $f0, $f0 /* 43A9A4 80218F14 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218D50_43A7E0 .L80218F1C: /* 43A9AC 80218F1C 3C014387 */ lui $at, 0x4387 /* 43A9B0 80218F20 44810000 */ mtc1 $at, $f0 -/* 43A9B4 80218F24 00000000 */ nop +/* 43A9B4 80218F24 00000000 */ nop /* 43A9B8 80218F28 461E0001 */ sub.s $f0, $f0, $f30 /* 43A9BC 80218F2C 46000005 */ abs.s $f0, $f0 /* 43A9C0 80218F30 4600010D */ trunc.w.s $f4, $f0 /* 43A9C4 80218F34 44022000 */ mfc1 $v0, $f4 -/* 43A9C8 80218F38 00000000 */ nop +/* 43A9C8 80218F38 00000000 */ nop /* 43A9CC 80218F3C 2842002D */ slti $v0, $v0, 0x2d /* 43A9D0 80218F40 1040000C */ beqz $v0, .L80218F74 /* 43A9D4 80218F44 0280202D */ daddu $a0, $s4, $zero /* 43A9D8 80218F48 3C014361 */ lui $at, 0x4361 /* 43A9DC 80218F4C 44810000 */ mtc1 $at, $f0 -/* 43A9E0 80218F50 00000000 */ nop +/* 43A9E0 80218F50 00000000 */ nop /* 43A9E4 80218F54 4600F001 */ sub.s $f0, $f30, $f0 /* 43A9E8 80218F58 46000000 */ add.s $f0, $f0, $f0 /* 43A9EC 80218F5C 3C014334 */ lui $at, 0x4334 /* 43A9F0 80218F60 44811000 */ mtc1 $at, $f2 -/* 43A9F4 80218F64 00000000 */ nop +/* 43A9F4 80218F64 00000000 */ nop /* 43A9F8 80218F68 46020000 */ add.s $f0, $f0, $f2 /* 43A9FC 80218F6C 4600010D */ trunc.w.s $f4, $f0 /* 43AA00 80218F70 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218D50_43A7E0 /* 43AA3C 80218FAC 24020002 */ addiu $v0, $zero, 2 /* 43AA40 80218FB0 03E00008 */ jr $ra /* 43AA44 80218FB4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 43AA48 80218FB8 00000000 */ nop -/* 43AA4C 80218FBC 00000000 */ nop +/* 43AA48 80218FB8 00000000 */ nop +/* 43AA4C 80218FBC 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s index 59fe2d4798..81ec216ec6 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s +++ b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s @@ -46,7 +46,7 @@ glabel DoBasicAI /* 25920 8004A520 8E2200B0 */ lw $v0, 0xb0($s1) /* 25924 8004A524 30420004 */ andi $v0, $v0, 4 /* 25928 8004A528 1040002B */ beqz $v0, .L8004A5D8 -/* 2592C 8004A52C 00000000 */ nop +/* 2592C 8004A52C 00000000 */ nop .L8004A530: /* 25930 8004A530 2404F7FF */ addiu $a0, $zero, -0x801 /* 25934 8004A534 AE400070 */ sw $zero, 0x70($s2) @@ -103,7 +103,7 @@ glabel DoBasicAI /* 259EC 8004A5EC 00220821 */ addu $at, $at, $v0 /* 259F0 8004A5F0 8C228728 */ lw $v0, %lo(D_80098728)($at) /* 259F4 8004A5F4 00400008 */ jr $v0 -/* 259F8 8004A5F8 00000000 */ nop +/* 259F8 8004A5F8 00000000 */ nop /* 259FC 8004A5FC 0240202D */ daddu $a0, $s2, $zero /* 25A00 8004A600 0260282D */ daddu $a1, $s3, $zero /* 25A04 8004A604 0C012568 */ jal func_800495A0 @@ -113,17 +113,17 @@ glabel DoBasicAI /* 25A14 8004A614 0C0125AE */ jal func_800496B8 /* 25A18 8004A618 0280302D */ daddu $a2, $s4, $zero /* 25A1C 8004A61C 080129B1 */ j .L8004A6C4 -/* 25A20 8004A620 00000000 */ nop +/* 25A20 8004A620 00000000 */ nop /* 25A24 8004A624 0240202D */ daddu $a0, $s2, $zero /* 25A28 8004A628 0260282D */ daddu $a1, $s3, $zero -/* 25A2C 8004A62C 0C0126D1 */ jal func_80049B44 +/* 25A2C 8004A62C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 25A30 8004A630 0280302D */ daddu $a2, $s4, $zero /* 25A34 8004A634 0240202D */ daddu $a0, $s2, $zero /* 25A38 8004A638 0260282D */ daddu $a1, $s3, $zero /* 25A3C 8004A63C 0C012701 */ jal func_80049C04 /* 25A40 8004A640 0280302D */ daddu $a2, $s4, $zero /* 25A44 8004A644 080129B1 */ j .L8004A6C4 -/* 25A48 8004A648 00000000 */ nop +/* 25A48 8004A648 00000000 */ nop /* 25A4C 8004A64C 0240202D */ daddu $a0, $s2, $zero /* 25A50 8004A650 0260282D */ daddu $a1, $s3, $zero /* 25A54 8004A654 0C01278F */ jal func_80049E3C @@ -133,7 +133,7 @@ glabel DoBasicAI /* 25A64 8004A664 0C0127B3 */ jal func_80049ECC /* 25A68 8004A668 0280302D */ daddu $a2, $s4, $zero /* 25A6C 8004A66C 080129B1 */ j .L8004A6C4 -/* 25A70 8004A670 00000000 */ nop +/* 25A70 8004A670 00000000 */ nop /* 25A74 8004A674 0240202D */ daddu $a0, $s2, $zero /* 25A78 8004A678 0260282D */ daddu $a1, $s3, $zero /* 25A7C 8004A67C 0C0127DF */ jal func_80049F7C @@ -145,13 +145,13 @@ glabel DoBasicAI /* 25A94 8004A694 8E430070 */ lw $v1, 0x70($s2) /* 25A98 8004A698 2402000E */ addiu $v0, $zero, 0xe /* 25A9C 8004A69C 14620009 */ bne $v1, $v0, .L8004A6C4 -/* 25AA0 8004A6A0 00000000 */ nop +/* 25AA0 8004A6A0 00000000 */ nop /* 25AA4 8004A6A4 0240202D */ daddu $a0, $s2, $zero /* 25AA8 8004A6A8 0260282D */ daddu $a1, $s3, $zero /* 25AAC 8004A6AC 0C0128FA */ jal func_8004A3E8 /* 25AB0 8004A6B0 0280302D */ daddu $a2, $s4, $zero /* 25AB4 8004A6B4 080129B1 */ j .L8004A6C4 -/* 25AB8 8004A6B8 00000000 */ nop +/* 25AB8 8004A6B8 00000000 */ nop /* 25ABC 8004A6BC 0C0129CF */ jal func_8004A73C /* 25AC0 8004A6C0 0240202D */ daddu $a0, $s2, $zero .L8004A6C4: @@ -165,4 +165,4 @@ glabel DoBasicAI /* 25AE0 8004A6E0 0000102D */ daddu $v0, $zero, $zero /* 25AE4 8004A6E4 03E00008 */ jr $ra /* 25AE8 8004A6E8 27BD0050 */ addiu $sp, $sp, 0x50 -/* 25AEC 8004A6EC 00000000 */ nop +/* 25AEC 8004A6EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241668_BE4E18.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241668_BE4E18.s deleted file mode 100644 index 8df77a22da..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241668_BE4E18.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_BE4E18 -/* BE4E18 80241668 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE4E1C 8024166C AFB3001C */ sw $s3, 0x1c($sp) -/* BE4E20 80241670 0080982D */ daddu $s3, $a0, $zero -/* BE4E24 80241674 AFBF0020 */ sw $ra, 0x20($sp) -/* BE4E28 80241678 AFB20018 */ sw $s2, 0x18($sp) -/* BE4E2C 8024167C AFB10014 */ sw $s1, 0x14($sp) -/* BE4E30 80241680 AFB00010 */ sw $s0, 0x10($sp) -/* BE4E34 80241684 8E720148 */ lw $s2, 0x148($s3) -/* BE4E38 80241688 86440008 */ lh $a0, 8($s2) -/* BE4E3C 8024168C 0C00EABB */ jal get_npc_unsafe -/* BE4E40 80241690 00A0882D */ daddu $s1, $a1, $zero -/* BE4E44 80241694 8E240008 */ lw $a0, 8($s1) -/* BE4E48 80241698 0040802D */ daddu $s0, $v0, $zero -/* BE4E4C 8024169C 00041FC2 */ srl $v1, $a0, 0x1f -/* BE4E50 802416A0 00832021 */ addu $a0, $a0, $v1 -/* BE4E54 802416A4 00042043 */ sra $a0, $a0, 1 -/* BE4E58 802416A8 0C00A67F */ jal rand_int -/* BE4E5C 802416AC 24840001 */ addiu $a0, $a0, 1 -/* BE4E60 802416B0 8E230008 */ lw $v1, 8($s1) -/* BE4E64 802416B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE4E68 802416B8 00032FC2 */ srl $a1, $v1, 0x1f -/* BE4E6C 802416BC 00651821 */ addu $v1, $v1, $a1 -/* BE4E70 802416C0 00031843 */ sra $v1, $v1, 1 -/* BE4E74 802416C4 00621821 */ addu $v1, $v1, $v0 -/* BE4E78 802416C8 0C00A67F */ jal rand_int -/* BE4E7C 802416CC A603008E */ sh $v1, 0x8e($s0) -/* BE4E80 802416D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE4E84 802416D4 44820000 */ mtc1 $v0, $f0 -/* BE4E88 802416D8 00000000 */ nop -/* BE4E8C 802416DC 46800020 */ cvt.s.w $f0, $f0 -/* BE4E90 802416E0 46006300 */ add.s $f12, $f12, $f0 -/* BE4E94 802416E4 3C0142B4 */ lui $at, 0x42b4 -/* BE4E98 802416E8 44810000 */ mtc1 $at, $f0 -/* BE4E9C 802416EC 0C00A6C9 */ jal clamp_angle -/* BE4EA0 802416F0 46006301 */ sub.s $f12, $f12, $f0 -/* BE4EA4 802416F4 E600000C */ swc1 $f0, 0xc($s0) -/* BE4EA8 802416F8 8E4200CC */ lw $v0, 0xcc($s2) -/* BE4EAC 802416FC 8C420000 */ lw $v0, ($v0) -/* BE4EB0 80241700 AE020028 */ sw $v0, 0x28($s0) -/* BE4EB4 80241704 24020003 */ addiu $v0, $zero, 3 -/* BE4EB8 80241708 AE620070 */ sw $v0, 0x70($s3) -/* BE4EBC 8024170C 8FBF0020 */ lw $ra, 0x20($sp) -/* BE4EC0 80241710 8FB3001C */ lw $s3, 0x1c($sp) -/* BE4EC4 80241714 8FB20018 */ lw $s2, 0x18($sp) -/* BE4EC8 80241718 8FB10014 */ lw $s1, 0x14($sp) -/* BE4ECC 8024171C 8FB00010 */ lw $s0, 0x10($sp) -/* BE4ED0 80241720 03E00008 */ jr $ra -/* BE4ED4 80241724 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index d17d6e5769..e2d98dcb77 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -54,7 +54,7 @@ glabel func_8024219C_BE594C /* BE5A0C 8024225C 8E4300B0 */ lw $v1, 0xb0($s2) /* BE5A10 80242260 30620004 */ andi $v0, $v1, 4 /* BE5A14 80242264 10400007 */ beqz $v0, .L80242284 -/* BE5A18 80242268 00000000 */ nop +/* BE5A18 80242268 00000000 */ nop /* BE5A1C 8024226C 824200B4 */ lb $v0, 0xb4($s2) /* BE5A20 80242270 1440003C */ bnez $v0, .L80242364 /* BE5A24 80242274 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_8024219C_BE594C /* BE5A48 80242298 00220821 */ addu $at, $at, $v0 /* BE5A4C 8024229C 8C2242E8 */ lw $v0, %lo(D_802442E8)($at) /* BE5A50 802422A0 00400008 */ jr $v0 -/* BE5A54 802422A4 00000000 */ nop +/* BE5A54 802422A4 00000000 */ nop /* BE5A58 802422A8 0280202D */ daddu $a0, $s4, $zero /* BE5A5C 802422AC 0200282D */ daddu $a1, $s0, $zero /* BE5A60 802422B0 0C0903A4 */ jal func_80240E90_BE4640 @@ -83,7 +83,7 @@ glabel func_8024219C_BE594C /* BE5A7C 802422CC 0000102D */ daddu $v0, $zero, $zero /* BE5A80 802422D0 0280202D */ daddu $a0, $s4, $zero /* BE5A84 802422D4 0200282D */ daddu $a1, $s0, $zero -/* BE5A88 802422D8 0C09059A */ jal func_80241668_BE4E18 +/* BE5A88 802422D8 0C09059A */ jal dup_arn_04_UnkNpcAIFunc1 /* BE5A8C 802422DC 0260302D */ daddu $a2, $s3, $zero /* BE5A90 802422E0 0280202D */ daddu $a0, $s4, $zero /* BE5A94 802422E4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C_C001AC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C_C001AC.s deleted file mode 100644 index 1ac3cb17f9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C_C001AC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024292C_C001AC -/* C001AC 8024292C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C001B0 80242930 AFB3001C */ sw $s3, 0x1c($sp) -/* C001B4 80242934 0080982D */ daddu $s3, $a0, $zero -/* C001B8 80242938 AFBF0020 */ sw $ra, 0x20($sp) -/* C001BC 8024293C AFB20018 */ sw $s2, 0x18($sp) -/* C001C0 80242940 AFB10014 */ sw $s1, 0x14($sp) -/* C001C4 80242944 AFB00010 */ sw $s0, 0x10($sp) -/* C001C8 80242948 8E720148 */ lw $s2, 0x148($s3) -/* C001CC 8024294C 86440008 */ lh $a0, 8($s2) -/* C001D0 80242950 0C00EABB */ jal get_npc_unsafe -/* C001D4 80242954 00A0882D */ daddu $s1, $a1, $zero -/* C001D8 80242958 8E240008 */ lw $a0, 8($s1) -/* C001DC 8024295C 0040802D */ daddu $s0, $v0, $zero -/* C001E0 80242960 00041FC2 */ srl $v1, $a0, 0x1f -/* C001E4 80242964 00832021 */ addu $a0, $a0, $v1 -/* C001E8 80242968 00042043 */ sra $a0, $a0, 1 -/* C001EC 8024296C 0C00A67F */ jal rand_int -/* C001F0 80242970 24840001 */ addiu $a0, $a0, 1 -/* C001F4 80242974 8E230008 */ lw $v1, 8($s1) -/* C001F8 80242978 240400B4 */ addiu $a0, $zero, 0xb4 -/* C001FC 8024297C 00032FC2 */ srl $a1, $v1, 0x1f -/* C00200 80242980 00651821 */ addu $v1, $v1, $a1 -/* C00204 80242984 00031843 */ sra $v1, $v1, 1 -/* C00208 80242988 00621821 */ addu $v1, $v1, $v0 -/* C0020C 8024298C 0C00A67F */ jal rand_int -/* C00210 80242990 A603008E */ sh $v1, 0x8e($s0) -/* C00214 80242994 C60C000C */ lwc1 $f12, 0xc($s0) -/* C00218 80242998 44820000 */ mtc1 $v0, $f0 -/* C0021C 8024299C 00000000 */ nop -/* C00220 802429A0 46800020 */ cvt.s.w $f0, $f0 -/* C00224 802429A4 46006300 */ add.s $f12, $f12, $f0 -/* C00228 802429A8 3C0142B4 */ lui $at, 0x42b4 -/* C0022C 802429AC 44810000 */ mtc1 $at, $f0 -/* C00230 802429B0 0C00A6C9 */ jal clamp_angle -/* C00234 802429B4 46006301 */ sub.s $f12, $f12, $f0 -/* C00238 802429B8 E600000C */ swc1 $f0, 0xc($s0) -/* C0023C 802429BC 8E4200CC */ lw $v0, 0xcc($s2) -/* C00240 802429C0 8C420000 */ lw $v0, ($v0) -/* C00244 802429C4 AE020028 */ sw $v0, 0x28($s0) -/* C00248 802429C8 24020003 */ addiu $v0, $zero, 3 -/* C0024C 802429CC AE620070 */ sw $v0, 0x70($s3) -/* C00250 802429D0 8FBF0020 */ lw $ra, 0x20($sp) -/* C00254 802429D4 8FB3001C */ lw $s3, 0x1c($sp) -/* C00258 802429D8 8FB20018 */ lw $s2, 0x18($sp) -/* C0025C 802429DC 8FB10014 */ lw $s1, 0x14($sp) -/* C00260 802429E0 8FB00010 */ lw $s0, 0x10($sp) -/* C00264 802429E4 03E00008 */ jr $ra -/* C00268 802429E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index 5531b934fa..dd007c20e6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -46,7 +46,7 @@ glabel func_802430C0_C00940 /* C009E4 80243164 8E2200B0 */ lw $v0, 0xb0($s1) /* C009E8 80243168 30420004 */ andi $v0, $v0, 4 /* C009EC 8024316C 10400044 */ beqz $v0, .L80243280 -/* C009F0 80243170 00000000 */ nop +/* C009F0 80243170 00000000 */ nop .L80243174: /* C009F4 80243174 2404F7FF */ addiu $a0, $zero, -0x801 /* C009F8 80243178 AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_802430C0_C00940 /* C00AAC 8024322C 3C0142C8 */ lui $at, 0x42c8 /* C00AB0 80243230 44812000 */ mtc1 $at, $f4 /* C00AB4 80243234 44823000 */ mtc1 $v0, $f6 -/* C00AB8 80243238 00000000 */ nop +/* C00AB8 80243238 00000000 */ nop /* C00ABC 8024323C 468031A0 */ cvt.s.w $f6, $f6 /* C00AC0 80243240 27A20044 */ addiu $v0, $sp, 0x44 /* C00AC4 80243244 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_802430C0_C00940 /* C00AE8 80243268 0C0372DF */ jal func_800DCB7C /* C00AEC 8024326C 27A70040 */ addiu $a3, $sp, 0x40 /* C00AF0 80243270 10400003 */ beqz $v0, .L80243280 -/* C00AF4 80243274 00000000 */ nop +/* C00AF4 80243274 00000000 */ nop /* C00AF8 80243278 C7A0003C */ lwc1 $f0, 0x3c($sp) /* C00AFC 8024327C E640003C */ swc1 $f0, 0x3c($s2) .L80243280: @@ -128,7 +128,7 @@ glabel func_802430C0_C00940 /* C00B14 80243294 00220821 */ addu $at, $at, $v0 /* C00B18 80243298 8C223520 */ lw $v0, %lo(D_80263520)($at) /* C00B1C 8024329C 00400008 */ jr $v0 -/* C00B20 802432A0 00000000 */ nop +/* C00B20 802432A0 00000000 */ nop /* C00B24 802432A4 0280202D */ daddu $a0, $s4, $zero /* C00B28 802432A8 0260282D */ daddu $a1, $s3, $zero /* C00B2C 802432AC 0C09094B */ jal func_8024252C_BFFDAC @@ -138,23 +138,23 @@ glabel func_802430C0_C00940 /* C00B3C 802432BC 0C0909A1 */ jal func_80242684_BFFF04 /* C00B40 802432C0 02A0302D */ daddu $a2, $s5, $zero /* C00B44 802432C4 08090CE5 */ j .L80243394 -/* C00B48 802432C8 00000000 */ nop +/* C00B48 802432C8 00000000 */ nop /* C00B4C 802432CC 0280202D */ daddu $a0, $s4, $zero /* C00B50 802432D0 0260282D */ daddu $a1, $s3, $zero -/* C00B54 802432D4 0C090A4B */ jal func_8024292C_C001AC +/* C00B54 802432D4 0C090A4B */ jal dup_dgb_01_UnkNpcAIFunc1 /* C00B58 802432D8 02A0302D */ daddu $a2, $s5, $zero /* C00B5C 802432DC 0280202D */ daddu $a0, $s4, $zero /* C00B60 802432E0 0260282D */ daddu $a1, $s3, $zero /* C00B64 802432E4 0C090A7B */ jal func_802429EC_C0026C /* C00B68 802432E8 02A0302D */ daddu $a2, $s5, $zero /* C00B6C 802432EC 08090CE5 */ j .L80243394 -/* C00B70 802432F0 00000000 */ nop +/* C00B70 802432F0 00000000 */ nop /* C00B74 802432F4 0280202D */ daddu $a0, $s4, $zero /* C00B78 802432F8 0260282D */ daddu $a1, $s3, $zero /* C00B7C 802432FC 0C090AEA */ jal func_80242BA8_C00428 /* C00B80 80243300 02A0302D */ daddu $a2, $s5, $zero /* C00B84 80243304 08090CE5 */ j .L80243394 -/* C00B88 80243308 00000000 */ nop +/* C00B88 80243308 00000000 */ nop /* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero /* C00B90 80243310 0260282D */ daddu $a1, $s3, $zero /* C00B94 80243314 0C090B17 */ jal dgb_01_NpcJumpFunc2 @@ -164,7 +164,7 @@ glabel func_802430C0_C00940 /* C00BA4 80243324 0C090B34 */ jal dgb_01_NpcJumpFunc /* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero /* C00BAC 8024332C 08090CE5 */ j .L80243394 -/* C00BB0 80243330 00000000 */ nop +/* C00BB0 80243330 00000000 */ nop /* C00BB4 80243334 0280202D */ daddu $a0, $s4, $zero /* C00BB8 80243338 0260282D */ daddu $a1, $s3, $zero /* C00BBC 8024333C 0C090B52 */ jal func_80242D48_C005C8 @@ -174,19 +174,19 @@ glabel func_802430C0_C00940 /* C00BCC 8024334C 0C090B9E */ jal func_80242E78_C006F8 /* C00BD0 80243350 02A0302D */ daddu $a2, $s5, $zero /* C00BD4 80243354 08090CE5 */ j .L80243394 -/* C00BD8 80243358 00000000 */ nop +/* C00BD8 80243358 00000000 */ nop /* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero /* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero /* C00BE4 80243364 0C090BE6 */ jal dgb_01_UnkNpcDurationFlagFunc /* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero /* C00BEC 8024336C 08090CE5 */ j .L80243394 -/* C00BF0 80243370 00000000 */ nop +/* C00BF0 80243370 00000000 */ nop /* C00BF4 80243374 0280202D */ daddu $a0, $s4, $zero /* C00BF8 80243378 0260282D */ daddu $a1, $s3, $zero /* C00BFC 8024337C 0C090C00 */ jal func_80243000_C00880 /* C00C00 80243380 02A0302D */ daddu $a2, $s5, $zero /* C00C04 80243384 08090CE5 */ j .L80243394 -/* C00C08 80243388 00000000 */ nop +/* C00C08 80243388 00000000 */ nop /* C00C0C 8024338C 0C0129CF */ jal func_8004A73C /* C00C10 80243390 0280202D */ daddu $a0, $s4, $zero .L80243394: diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s index b6e1e3a00b..333e49742d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -117,7 +117,7 @@ glabel func_8024061C_C2F1BC /* C2F364 802407C4 00000000 */ nop /* C2F368 802407C8 0240202D */ daddu $a0, $s2, $zero /* C2F36C 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C2F370 802407D0 0C0126D1 */ jal func_80049B44 +/* C2F370 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C2F374 802407D4 0280302D */ daddu $a2, $s4, $zero /* C2F378 802407D8 0240202D */ daddu $a0, $s2, $zero /* C2F37C 802407DC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index 17b90e3e88..6f026ae755 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -117,7 +117,7 @@ glabel func_8024086C_C31D4C /* C31EF4 80240A14 00000000 */ nop /* C31EF8 80240A18 0240202D */ daddu $a0, $s2, $zero /* C31EFC 80240A1C 0260282D */ daddu $a1, $s3, $zero -/* C31F00 80240A20 0C0126D1 */ jal func_80049B44 +/* C31F00 80240A20 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C31F04 80240A24 0280302D */ daddu $a2, $s4, $zero /* C31F08 80240A28 0240202D */ daddu $a0, $s2, $zero /* C31F0C 80240A2C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 7c047b4db5..465ca3ba5c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -117,7 +117,7 @@ glabel func_802411D0_C3BBE0 /* C3BD88 80241378 00000000 */ nop /* C3BD8C 8024137C 0240202D */ daddu $a0, $s2, $zero /* C3BD90 80241380 0260282D */ daddu $a1, $s3, $zero -/* C3BD94 80241384 0C0126D1 */ jal func_80049B44 +/* C3BD94 80241384 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C3BD98 80241388 0280302D */ daddu $a2, $s4, $zero /* C3BD9C 8024138C 0240202D */ daddu $a0, $s2, $zero /* C3BDA0 80241390 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index feb957741c..ca350e9be9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -117,7 +117,7 @@ glabel func_80241170_C3ED60 /* C3EF08 80241318 00000000 */ nop /* C3EF0C 8024131C 0240202D */ daddu $a0, $s2, $zero /* C3EF10 80241320 0260282D */ daddu $a1, $s3, $zero -/* C3EF14 80241324 0C0126D1 */ jal func_80049B44 +/* C3EF14 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C3EF18 80241328 0280302D */ daddu $a2, $s4, $zero /* C3EF1C 8024132C 0240202D */ daddu $a0, $s2, $zero /* C3EF20 80241330 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s index e2007190be..ee9b4c96f4 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -117,7 +117,7 @@ glabel func_802414AC_C4125C /* C41404 80241654 00000000 */ nop /* C41408 80241658 0240202D */ daddu $a0, $s2, $zero /* C4140C 8024165C 0260282D */ daddu $a1, $s3, $zero -/* C41410 80241660 0C0126D1 */ jal func_80049B44 +/* C41410 80241660 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C41414 80241664 0280302D */ daddu $a2, $s4, $zero /* C41418 80241668 0240202D */ daddu $a0, $s2, $zero /* C4141C 8024166C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241F38_C41CE8.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241F38_C41CE8.s deleted file mode 100644 index 4fefeb90f1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241F38_C41CE8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F38_C41CE8 -/* C41CE8 80241F38 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C41CEC 80241F3C AFB3001C */ sw $s3, 0x1c($sp) -/* C41CF0 80241F40 0080982D */ daddu $s3, $a0, $zero -/* C41CF4 80241F44 AFBF0020 */ sw $ra, 0x20($sp) -/* C41CF8 80241F48 AFB20018 */ sw $s2, 0x18($sp) -/* C41CFC 80241F4C AFB10014 */ sw $s1, 0x14($sp) -/* C41D00 80241F50 AFB00010 */ sw $s0, 0x10($sp) -/* C41D04 80241F54 8E720148 */ lw $s2, 0x148($s3) -/* C41D08 80241F58 86440008 */ lh $a0, 8($s2) -/* C41D0C 80241F5C 0C00EABB */ jal get_npc_unsafe -/* C41D10 80241F60 00A0882D */ daddu $s1, $a1, $zero -/* C41D14 80241F64 8E240008 */ lw $a0, 8($s1) -/* C41D18 80241F68 0040802D */ daddu $s0, $v0, $zero -/* C41D1C 80241F6C 00041FC2 */ srl $v1, $a0, 0x1f -/* C41D20 80241F70 00832021 */ addu $a0, $a0, $v1 -/* C41D24 80241F74 00042043 */ sra $a0, $a0, 1 -/* C41D28 80241F78 0C00A67F */ jal rand_int -/* C41D2C 80241F7C 24840001 */ addiu $a0, $a0, 1 -/* C41D30 80241F80 8E230008 */ lw $v1, 8($s1) -/* C41D34 80241F84 240400B4 */ addiu $a0, $zero, 0xb4 -/* C41D38 80241F88 00032FC2 */ srl $a1, $v1, 0x1f -/* C41D3C 80241F8C 00651821 */ addu $v1, $v1, $a1 -/* C41D40 80241F90 00031843 */ sra $v1, $v1, 1 -/* C41D44 80241F94 00621821 */ addu $v1, $v1, $v0 -/* C41D48 80241F98 0C00A67F */ jal rand_int -/* C41D4C 80241F9C A603008E */ sh $v1, 0x8e($s0) -/* C41D50 80241FA0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C41D54 80241FA4 44820000 */ mtc1 $v0, $f0 -/* C41D58 80241FA8 00000000 */ nop -/* C41D5C 80241FAC 46800020 */ cvt.s.w $f0, $f0 -/* C41D60 80241FB0 46006300 */ add.s $f12, $f12, $f0 -/* C41D64 80241FB4 3C0142B4 */ lui $at, 0x42b4 -/* C41D68 80241FB8 44810000 */ mtc1 $at, $f0 -/* C41D6C 80241FBC 0C00A6C9 */ jal clamp_angle -/* C41D70 80241FC0 46006301 */ sub.s $f12, $f12, $f0 -/* C41D74 80241FC4 E600000C */ swc1 $f0, 0xc($s0) -/* C41D78 80241FC8 8E4200CC */ lw $v0, 0xcc($s2) -/* C41D7C 80241FCC 8C420000 */ lw $v0, ($v0) -/* C41D80 80241FD0 AE020028 */ sw $v0, 0x28($s0) -/* C41D84 80241FD4 24020003 */ addiu $v0, $zero, 3 -/* C41D88 80241FD8 AE620070 */ sw $v0, 0x70($s3) -/* C41D8C 80241FDC 8FBF0020 */ lw $ra, 0x20($sp) -/* C41D90 80241FE0 8FB3001C */ lw $s3, 0x1c($sp) -/* C41D94 80241FE4 8FB20018 */ lw $s2, 0x18($sp) -/* C41D98 80241FE8 8FB10014 */ lw $s1, 0x14($sp) -/* C41D9C 80241FEC 8FB00010 */ lw $s0, 0x10($sp) -/* C41DA0 80241FF0 03E00008 */ jr $ra -/* C41DA4 80241FF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index f5730c6a13..b72d64f51b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -54,7 +54,7 @@ glabel func_80242A6C_C4281C /* C428DC 80242B2C 8E4300B0 */ lw $v1, 0xb0($s2) /* C428E0 80242B30 30620004 */ andi $v0, $v1, 4 /* C428E4 80242B34 10400007 */ beqz $v0, .L80242B54 -/* C428E8 80242B38 00000000 */ nop +/* C428E8 80242B38 00000000 */ nop /* C428EC 80242B3C 824200B4 */ lb $v0, 0xb4($s2) /* C428F0 80242B40 1440003C */ bnez $v0, .L80242C34 /* C428F4 80242B44 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_80242A6C_C4281C /* C42918 80242B68 00220821 */ addu $at, $at, $v0 /* C4291C 80242B6C 8C226D50 */ lw $v0, %lo(D_80246D50)($at) /* C42920 80242B70 00400008 */ jr $v0 -/* C42924 80242B74 00000000 */ nop +/* C42924 80242B74 00000000 */ nop /* C42928 80242B78 0280202D */ daddu $a0, $s4, $zero /* C4292C 80242B7C 0200282D */ daddu $a1, $s0, $zero /* C42930 80242B80 0C0905D8 */ jal func_80241760_C41510 @@ -83,7 +83,7 @@ glabel func_80242A6C_C4281C /* C4294C 80242B9C 0000102D */ daddu $v0, $zero, $zero /* C42950 80242BA0 0280202D */ daddu $a0, $s4, $zero /* C42954 80242BA4 0200282D */ daddu $a1, $s0, $zero -/* C42958 80242BA8 0C0907CE */ jal func_80241F38_C41CE8 +/* C42958 80242BA8 0C0907CE */ jal dup_dgb_08_UnkNpcAIFunc1 /* C4295C 80242BAC 0260302D */ daddu $a2, $s3, $zero /* C42960 80242BB0 0280202D */ daddu $a0, $s4, $zero /* C42964 80242BB4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s index 0873c74d4e..aa82550ba3 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s @@ -58,7 +58,7 @@ glabel func_802438F0_C436A0 /* C43770 802439C0 00220821 */ addu $at, $at, $v0 /* C43774 802439C4 8C226DA0 */ lw $v0, %lo(D_80246DA0)($at) /* C43778 802439C8 00400008 */ jr $v0 -/* C4377C 802439CC 00000000 */ nop +/* C4377C 802439CC 00000000 */ nop /* C43780 802439D0 0280202D */ daddu $a0, $s4, $zero /* C43784 802439D4 0220282D */ daddu $a1, $s1, $zero /* C43788 802439D8 0C0905D8 */ jal func_80241760_C41510 @@ -76,10 +76,10 @@ glabel func_802438F0_C436A0 /* C437B8 80243A08 0C090644 */ jal func_80241910_C416C0 /* C437BC 80243A0C 0260302D */ daddu $a2, $s3, $zero /* C437C0 80243A10 08090E8E */ j .L80243A38 -/* C437C4 80243A14 00000000 */ nop +/* C437C4 80243A14 00000000 */ nop /* C437C8 80243A18 0280202D */ daddu $a0, $s4, $zero /* C437CC 80243A1C 0220282D */ daddu $a1, $s1, $zero -/* C437D0 80243A20 0C0907CE */ jal func_80241F38_C41CE8 +/* C437D0 80243A20 0C0907CE */ jal dup_dgb_08_UnkNpcAIFunc1 /* C437D4 80243A24 0260302D */ daddu $a2, $s3, $zero /* C437D8 80243A28 0280202D */ daddu $a0, $s4, $zero /* C437DC 80243A2C 0220282D */ daddu $a1, $s1, $zero @@ -99,13 +99,13 @@ glabel func_802438F0_C436A0 /* C43810 80243A60 8E830070 */ lw $v1, 0x70($s4) /* C43814 80243A64 2402000D */ addiu $v0, $zero, 0xd /* C43818 80243A68 14620033 */ bne $v1, $v0, .L80243B38 -/* C4381C 80243A6C 00000000 */ nop +/* C4381C 80243A6C 00000000 */ nop /* C43820 80243A70 0280202D */ daddu $a0, $s4, $zero /* C43824 80243A74 0220282D */ daddu $a1, $s1, $zero /* C43828 80243A78 0C090B6C */ jal func_80242DB0_C42B60 /* C4382C 80243A7C 0260302D */ daddu $a2, $s3, $zero /* C43830 80243A80 08090ECE */ j .L80243B38 -/* C43834 80243A84 00000000 */ nop +/* C43834 80243A84 00000000 */ nop /* C43838 80243A88 0280202D */ daddu $a0, $s4, $zero /* C4383C 80243A8C 0220282D */ daddu $a1, $s1, $zero /* C43840 80243A90 0C090BAD */ jal func_80242EB4_C42C64 @@ -113,13 +113,13 @@ glabel func_802438F0_C436A0 /* C43848 80243A98 8E830070 */ lw $v1, 0x70($s4) /* C4384C 80243A9C 2402000F */ addiu $v0, $zero, 0xf /* C43850 80243AA0 14620025 */ bne $v1, $v0, .L80243B38 -/* C43854 80243AA4 00000000 */ nop +/* C43854 80243AA4 00000000 */ nop /* C43858 80243AA8 0280202D */ daddu $a0, $s4, $zero /* C4385C 80243AAC 0220282D */ daddu $a1, $s1, $zero /* C43860 80243AB0 0C090BE5 */ jal func_80242F94_C42D44 /* C43864 80243AB4 0260302D */ daddu $a2, $s3, $zero /* C43868 80243AB8 08090ECE */ j .L80243B38 -/* C4386C 80243ABC 00000000 */ nop +/* C4386C 80243ABC 00000000 */ nop /* C43870 80243AC0 0280202D */ daddu $a0, $s4, $zero /* C43874 80243AC4 0220282D */ daddu $a1, $s1, $zero /* C43878 80243AC8 0C090C8C */ jal func_80243230_C42FE0 @@ -129,19 +129,19 @@ glabel func_802438F0_C436A0 /* C43888 80243AD8 0C090CBA */ jal func_802432E8_C43098 /* C4388C 80243ADC 0260302D */ daddu $a2, $s3, $zero /* C43890 80243AE0 08090ECE */ j .L80243B38 -/* C43894 80243AE4 00000000 */ nop +/* C43894 80243AE4 00000000 */ nop /* C43898 80243AE8 0280202D */ daddu $a0, $s4, $zero /* C4389C 80243AEC 0220282D */ daddu $a1, $s1, $zero /* C438A0 80243AF0 0C090D1A */ jal func_80243468_C43218 /* C438A4 80243AF4 0260302D */ daddu $a2, $s3, $zero /* C438A8 80243AF8 08090ECE */ j .L80243B38 -/* C438AC 80243AFC 00000000 */ nop +/* C438AC 80243AFC 00000000 */ nop /* C438B0 80243B00 0280202D */ daddu $a0, $s4, $zero /* C438B4 80243B04 0220282D */ daddu $a1, $s1, $zero /* C438B8 80243B08 0C090D2C */ jal func_802434B0_C43260 /* C438BC 80243B0C 0260302D */ daddu $a2, $s3, $zero /* C438C0 80243B10 08090ECE */ j .L80243B38 -/* C438C4 80243B14 00000000 */ nop +/* C438C4 80243B14 00000000 */ nop /* C438C8 80243B18 0280202D */ daddu $a0, $s4, $zero /* C438CC 80243B1C 0220282D */ daddu $a1, $s1, $zero /* C438D0 80243B20 0C090D4C */ jal func_80243530_C432E0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index 99a20416dd..b091ed3403 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -117,7 +117,7 @@ glabel func_8024061C_C471FC /* C473A4 802407C4 00000000 */ nop /* C473A8 802407C8 0240202D */ daddu $a0, $s2, $zero /* C473AC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C473B0 802407D0 0C0126D1 */ jal func_80049B44 +/* C473B0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C473B4 802407D4 0280302D */ daddu $a2, $s4, $zero /* C473B8 802407D8 0240202D */ daddu $a0, $s2, $zero /* C473BC 802407DC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index 119a8b2e23..a56ac7182e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -117,7 +117,7 @@ glabel func_8024061C_C4FB2C /* C4FCD4 802407C4 00000000 */ nop /* C4FCD8 802407C8 0240202D */ daddu $a0, $s2, $zero /* C4FCDC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C4FCE0 802407D0 0C0126D1 */ jal func_80049B44 +/* C4FCE0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C4FCE4 802407D4 0280302D */ daddu $a2, $s4, $zero /* C4FCE8 802407D8 0240202D */ daddu $a0, $s2, $zero /* C4FCEC 802407DC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 72dfb603be..761ade26fb 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -117,7 +117,7 @@ glabel func_80241170_C536B0 /* C53858 80241318 00000000 */ nop /* C5385C 8024131C 0240202D */ daddu $a0, $s2, $zero /* C53860 80241320 0260282D */ daddu $a1, $s3, $zero -/* C53864 80241324 0C0126D1 */ jal func_80049B44 +/* C53864 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C53868 80241328 0280302D */ daddu $a2, $s4, $zero /* C5386C 8024132C 0240202D */ daddu $a0, $s2, $zero /* C53870 80241330 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_8024023C_95B43C.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_8024023C_95B43C.s deleted file mode 100644 index e2b18efb07..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_8024023C_95B43C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_95B43C -/* 95B43C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95B440 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 95B444 80240244 0080802D */ daddu $s0, $a0, $zero -/* 95B448 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 95B44C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95B450 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 95B454 80240254 0C0B210B */ jal get_float_variable -/* 95B458 80240258 8C450000 */ lw $a1, ($v0) -/* 95B45C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 95B460 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 95B464 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 95B468 80240268 44060000 */ mfc1 $a2, $f0 -/* 95B46C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 95B470 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 95B474 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95B478 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95B47C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 95B480 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 95B484 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 95B488 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 95B48C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 95B490 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 95B494 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 95B498 80240298 0C0B2190 */ jal set_float_variable -/* 95B49C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95B4A0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 95B4A4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 95B4A8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 95B4AC 802402AC 0C0B2190 */ jal set_float_variable -/* 95B4B0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95B4B4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 95B4B8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 95B4BC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 95B4C0 802402C0 0C0B2190 */ jal set_float_variable -/* 95B4C4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95B4C8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 95B4CC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 95B4D0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95B4D4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 95B4D8 802402D8 03E00008 */ jr $ra -/* 95B4DC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC_95E9DC.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC_95E9DC.s deleted file mode 100644 index d69e1fbb07..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC_95E9DC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437DC_95E9DC -/* 95E9DC 802437DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95E9E0 802437E0 AFB00018 */ sw $s0, 0x18($sp) -/* 95E9E4 802437E4 0080802D */ daddu $s0, $a0, $zero -/* 95E9E8 802437E8 AFBF001C */ sw $ra, 0x1c($sp) -/* 95E9EC 802437EC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95E9F0 802437F0 8E02000C */ lw $v0, 0xc($s0) -/* 95E9F4 802437F4 0C0B210B */ jal get_float_variable -/* 95E9F8 802437F8 8C450000 */ lw $a1, ($v0) -/* 95E9FC 802437FC 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EA00 80243800 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 95EA04 80243804 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 95EA08 80243808 44060000 */ mfc1 $a2, $f0 -/* 95EA0C 8024380C C4400028 */ lwc1 $f0, 0x28($v0) -/* 95EA10 80243810 C4420030 */ lwc1 $f2, 0x30($v0) -/* 95EA14 80243814 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95EA18 80243818 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95EA1C 8024381C 8C470080 */ lw $a3, 0x80($v0) -/* 95EA20 80243820 C454002C */ lwc1 $f20, 0x2c($v0) -/* 95EA24 80243824 0C00A7E7 */ jal add_vec2D_polar -/* 95EA28 80243828 27A50014 */ addiu $a1, $sp, 0x14 -/* 95EA2C 8024382C 0200202D */ daddu $a0, $s0, $zero -/* 95EA30 80243830 3C05FE36 */ lui $a1, 0xfe36 -/* 95EA34 80243834 8FA60010 */ lw $a2, 0x10($sp) -/* 95EA38 80243838 0C0B2190 */ jal set_float_variable -/* 95EA3C 8024383C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95EA40 80243840 0200202D */ daddu $a0, $s0, $zero -/* 95EA44 80243844 3C05FE36 */ lui $a1, 0xfe36 -/* 95EA48 80243848 4406A000 */ mfc1 $a2, $f20 -/* 95EA4C 8024384C 0C0B2190 */ jal set_float_variable -/* 95EA50 80243850 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95EA54 80243854 0200202D */ daddu $a0, $s0, $zero -/* 95EA58 80243858 3C05FE36 */ lui $a1, 0xfe36 -/* 95EA5C 8024385C 8FA60014 */ lw $a2, 0x14($sp) -/* 95EA60 80243860 0C0B2190 */ jal set_float_variable -/* 95EA64 80243864 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95EA68 80243868 8FBF001C */ lw $ra, 0x1c($sp) -/* 95EA6C 8024386C 8FB00018 */ lw $s0, 0x18($sp) -/* 95EA70 80243870 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95EA74 80243874 24020002 */ addiu $v0, $zero, 2 -/* 95EA78 80243878 03E00008 */ jr $ra -/* 95EA7C 8024387C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s index f92537a01e..a9f3de1f3f 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s @@ -46,7 +46,7 @@ glabel func_8024150C_CB024C /* CB02F0 802415B0 8E2200B0 */ lw $v0, 0xb0($s1) /* CB02F4 802415B4 30420004 */ andi $v0, $v0, 4 /* CB02F8 802415B8 1040001F */ beqz $v0, .L80241638 -/* CB02FC 802415BC 00000000 */ nop +/* CB02FC 802415BC 00000000 */ nop .L802415C0: /* CB0300 802415C0 2404F7FF */ addiu $a0, $zero, -0x801 /* CB0304 802415C4 AE800070 */ sw $zero, 0x70($s4) @@ -89,7 +89,7 @@ glabel func_8024150C_CB024C /* CB038C 8024164C 00220821 */ addu $at, $at, $v0 /* CB0390 80241650 8C226130 */ lw $v0, %lo(D_80246130)($at) /* CB0394 80241654 00400008 */ jr $v0 -/* CB0398 80241658 00000000 */ nop +/* CB0398 80241658 00000000 */ nop /* CB039C 8024165C 0280202D */ daddu $a0, $s4, $zero /* CB03A0 80241660 0240282D */ daddu $a1, $s2, $zero /* CB03A4 80241664 0C012568 */ jal func_800495A0 @@ -99,17 +99,17 @@ glabel func_8024150C_CB024C /* CB03B4 80241674 0C0125AE */ jal func_800496B8 /* CB03B8 80241678 0260302D */ daddu $a2, $s3, $zero /* CB03BC 8024167C 080905C7 */ j .L8024171C -/* CB03C0 80241680 00000000 */ nop +/* CB03C0 80241680 00000000 */ nop /* CB03C4 80241684 0280202D */ daddu $a0, $s4, $zero /* CB03C8 80241688 0240282D */ daddu $a1, $s2, $zero -/* CB03CC 8024168C 0C0126D1 */ jal func_80049B44 +/* CB03CC 8024168C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CB03D0 80241690 0260302D */ daddu $a2, $s3, $zero /* CB03D4 80241694 0280202D */ daddu $a0, $s4, $zero /* CB03D8 80241698 0240282D */ daddu $a1, $s2, $zero /* CB03DC 8024169C 0C012701 */ jal func_80049C04 /* CB03E0 802416A0 0260302D */ daddu $a2, $s3, $zero /* CB03E4 802416A4 080905C7 */ j .L8024171C -/* CB03E8 802416A8 00000000 */ nop +/* CB03E8 802416A8 00000000 */ nop /* CB03EC 802416AC 0280202D */ daddu $a0, $s4, $zero /* CB03F0 802416B0 0240282D */ daddu $a1, $s2, $zero /* CB03F4 802416B4 0C01278F */ jal func_80049E3C @@ -119,7 +119,7 @@ glabel func_8024150C_CB024C /* CB0404 802416C4 0C0127B3 */ jal func_80049ECC /* CB0408 802416C8 0260302D */ daddu $a2, $s3, $zero /* CB040C 802416CC 080905C7 */ j .L8024171C -/* CB0410 802416D0 00000000 */ nop +/* CB0410 802416D0 00000000 */ nop /* CB0414 802416D4 0280202D */ daddu $a0, $s4, $zero /* CB0418 802416D8 0240282D */ daddu $a1, $s2, $zero /* CB041C 802416DC 0C090360 */ jal func_80240D80_CAFAC0 @@ -129,13 +129,13 @@ glabel func_8024150C_CB024C /* CB042C 802416EC 0C0904D9 */ jal func_80241364_CB00A4 /* CB0430 802416F0 0260302D */ daddu $a2, $s3, $zero /* CB0434 802416F4 080905C7 */ j .L8024171C -/* CB0438 802416F8 00000000 */ nop +/* CB0438 802416F8 00000000 */ nop /* CB043C 802416FC 0280202D */ daddu $a0, $s4, $zero /* CB0440 80241700 0240282D */ daddu $a1, $s2, $zero /* CB0444 80241704 0C090532 */ jal func_802414C8_CB0208 /* CB0448 80241708 0260302D */ daddu $a2, $s3, $zero /* CB044C 8024170C 080905C7 */ j .L8024171C -/* CB0450 80241710 00000000 */ nop +/* CB0450 80241710 00000000 */ nop /* CB0454 80241714 0C0129CF */ jal func_8004A73C /* CB0458 80241718 0280202D */ daddu $a0, $s4, $zero .L8024171C: diff --git a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_8024023C_CBDF0C.s b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_8024023C_CBDF0C.s deleted file mode 100644 index 2b0515a251..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_8024023C_CBDF0C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_CBDF0C -/* CBDF0C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CBDF10 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* CBDF14 80240244 0080802D */ daddu $s0, $a0, $zero -/* CBDF18 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* CBDF1C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* CBDF20 80240250 8E02000C */ lw $v0, 0xc($s0) -/* CBDF24 80240254 0C0B210B */ jal get_float_variable -/* CBDF28 80240258 8C450000 */ lw $a1, ($v0) -/* CBDF2C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* CBDF30 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* CBDF34 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* CBDF38 80240268 44060000 */ mfc1 $a2, $f0 -/* CBDF3C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* CBDF40 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* CBDF44 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* CBDF48 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* CBDF4C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* CBDF50 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* CBDF54 80240284 0C00A7E7 */ jal add_vec2D_polar -/* CBDF58 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* CBDF5C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* CBDF60 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* CBDF64 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* CBDF68 80240298 0C0B2190 */ jal set_float_variable -/* CBDF6C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CBDF70 802402A0 0200202D */ daddu $a0, $s0, $zero -/* CBDF74 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* CBDF78 802402A8 4406A000 */ mfc1 $a2, $f20 -/* CBDF7C 802402AC 0C0B2190 */ jal set_float_variable -/* CBDF80 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* CBDF84 802402B4 0200202D */ daddu $a0, $s0, $zero -/* CBDF88 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* CBDF8C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* CBDF90 802402C0 0C0B2190 */ jal set_float_variable -/* CBDF94 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* CBDF98 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* CBDF9C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* CBDFA0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* CBDFA4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* CBDFA8 802402D8 03E00008 */ jr $ra -/* CBDFAC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s index cb8458387c..990f0e63e6 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s @@ -55,7 +55,7 @@ glabel func_8024262C_CC5E3C /* CC5F00 802426F0 8E2200B0 */ lw $v0, 0xb0($s1) /* CC5F04 802426F4 30420004 */ andi $v0, $v0, 4 /* CC5F08 802426F8 10400047 */ beqz $v0, .L80242818 -/* CC5F0C 802426FC 00000000 */ nop +/* CC5F0C 802426FC 00000000 */ nop .L80242700: /* CC5F10 80242700 AE600070 */ sw $zero, 0x70($s3) /* CC5F14 80242704 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_8024262C_CC5E3C /* CC5FB8 802427A8 24020028 */ addiu $v0, $zero, 0x28 /* CC5FBC 802427AC AFA2001C */ sw $v0, 0x1c($sp) /* CC5FC0 802427B0 44833000 */ mtc1 $v1, $f6 -/* CC5FC4 802427B4 00000000 */ nop +/* CC5FC4 802427B4 00000000 */ nop /* CC5FC8 802427B8 468031A0 */ cvt.s.w $f6, $f6 /* CC5FCC 802427BC 44073000 */ mfc1 $a3, $f6 /* CC5FD0 802427C0 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_8024262C_CC5E3C /* CC6088 80242878 10600015 */ beqz $v1, .L802428D0 /* CC608C 8024287C 0260202D */ daddu $a0, $s3, $zero /* CC6090 80242880 08090A76 */ j .L802429D8 -/* CC6094 80242884 00000000 */ nop +/* CC6094 80242884 00000000 */ nop .L80242888: /* CC6098 80242888 1062001C */ beq $v1, $v0, .L802428FC /* CC609C 8024288C 24020003 */ addiu $v0, $zero, 3 /* CC60A0 80242890 10620035 */ beq $v1, $v0, .L80242968 /* CC60A4 80242894 0260202D */ daddu $a0, $s3, $zero /* CC60A8 80242898 08090A76 */ j .L802429D8 -/* CC60AC 8024289C 00000000 */ nop +/* CC60AC 8024289C 00000000 */ nop .L802428A0: /* CC60B0 802428A0 2402000E */ addiu $v0, $zero, 0xe /* CC60B4 802428A4 1062003F */ beq $v1, $v0, .L802429A4 @@ -177,9 +177,9 @@ glabel func_8024262C_CC5E3C /* CC60C8 802428B8 10620040 */ beq $v1, $v0, .L802429BC /* CC60CC 802428BC 24020063 */ addiu $v0, $zero, 0x63 /* CC60D0 802428C0 10620043 */ beq $v1, $v0, .L802429D0 -/* CC60D4 802428C4 00000000 */ nop +/* CC60D4 802428C4 00000000 */ nop /* CC60D8 802428C8 08090A76 */ j .L802429D8 -/* CC60DC 802428CC 00000000 */ nop +/* CC60DC 802428CC 00000000 */ nop .L802428D0: /* CC60E0 802428D0 0280282D */ daddu $a1, $s4, $zero /* CC60E4 802428D4 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_8024262C_CC5E3C /* CC60FC 802428EC 0C0125AE */ jal func_800496B8 /* CC6100 802428F0 02A0302D */ daddu $a2, $s5, $zero /* CC6104 802428F4 08090A76 */ j .L802429D8 -/* CC6108 802428F8 00000000 */ nop +/* CC6108 802428F8 00000000 */ nop .L802428FC: /* CC610C 802428FC 0260202D */ daddu $a0, $s3, $zero /* CC6110 80242900 0280282D */ daddu $a1, $s4, $zero -/* CC6114 80242904 0C0126D1 */ jal func_80049B44 +/* CC6114 80242904 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CC6118 80242908 02A0302D */ daddu $a2, $s5, $zero /* CC611C 8024290C 8E230088 */ lw $v1, 0x88($s1) /* CC6120 80242910 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_8024262C_CC5E3C /* CC617C 8024296C 0C012701 */ jal func_80049C04 /* CC6180 80242970 02A0302D */ daddu $a2, $s5, $zero /* CC6184 80242974 08090A76 */ j .L802429D8 -/* CC6188 80242978 00000000 */ nop +/* CC6188 80242978 00000000 */ nop .L8024297C: /* CC618C 8024297C 0260202D */ daddu $a0, $s3, $zero /* CC6190 80242980 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_8024262C_CC5E3C /* CC61A4 80242994 0C0908C5 */ jal func_80242314_CC5B24 /* CC61A8 80242998 02A0302D */ daddu $a2, $s5, $zero /* CC61AC 8024299C 08090A76 */ j .L802429D8 -/* CC61B0 802429A0 00000000 */ nop +/* CC61B0 802429A0 00000000 */ nop .L802429A4: /* CC61B4 802429A4 0260202D */ daddu $a0, $s3, $zero /* CC61B8 802429A8 0280282D */ daddu $a1, $s4, $zero /* CC61BC 802429AC 0C090912 */ jal func_80242448_CC5C58 /* CC61C0 802429B0 02A0302D */ daddu $a2, $s5, $zero /* CC61C4 802429B4 08090A76 */ j .L802429D8 -/* CC61C8 802429B8 00000000 */ nop +/* CC61C8 802429B8 00000000 */ nop .L802429BC: /* CC61CC 802429BC 0280282D */ daddu $a1, $s4, $zero /* CC61D0 802429C0 0C09096B */ jal func_802425AC_CC5DBC /* CC61D4 802429C4 02A0302D */ daddu $a2, $s5, $zero /* CC61D8 802429C8 08090A76 */ j .L802429D8 -/* CC61DC 802429CC 00000000 */ nop +/* CC61DC 802429CC 00000000 */ nop .L802429D0: /* CC61E0 802429D0 0C0129CF */ jal func_8004A73C /* CC61E4 802429D4 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_8024262C_CC5E3C /* CC6238 80242A28 00220821 */ addu $at, $at, $v0 /* CC623C 80242A2C 8C227A90 */ lw $v0, %lo(D_80247A90)($at) /* CC6240 80242A30 00400008 */ jr $v0 -/* CC6244 80242A34 00000000 */ nop +/* CC6244 80242A34 00000000 */ nop /* CC6248 80242A38 8E420028 */ lw $v0, 0x28($s2) /* CC624C 80242A3C 24420001 */ addiu $v0, $v0, 1 /* CC6250 80242A40 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s index 6ea839f96c..7ec110ee3c 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s @@ -55,7 +55,7 @@ glabel func_80242A6C_CC627C /* CC6340 80242B30 8E430094 */ lw $v1, 0x94($s2) /* CC6344 80242B34 24020064 */ addiu $v0, $zero, 0x64 /* CC6348 80242B38 1462001C */ bne $v1, $v0, .L80242BAC -/* CC634C 80242B3C 00000000 */ nop +/* CC634C 80242B3C 00000000 */ nop .L80242B40: /* CC6350 80242B40 24020064 */ addiu $v0, $zero, 0x64 /* CC6354 80242B44 2404F7FF */ addiu $a0, $zero, -0x801 @@ -122,7 +122,7 @@ glabel func_80242A6C_CC627C /* CC6440 80242C30 24020028 */ addiu $v0, $zero, 0x28 /* CC6444 80242C34 AFA2001C */ sw $v0, 0x1c($sp) /* CC6448 80242C38 44834000 */ mtc1 $v1, $f8 -/* CC644C 80242C3C 00000000 */ nop +/* CC644C 80242C3C 00000000 */ nop /* CC6450 80242C40 46804220 */ cvt.s.w $f8, $f8 /* CC6454 80242C44 44074000 */ mfc1 $a3, $f8 /* CC6458 80242C48 27A20048 */ addiu $v0, $sp, 0x48 @@ -153,7 +153,7 @@ glabel func_80242A6C_CC627C /* CC64B4 80242CA4 8EA20070 */ lw $v0, 0x70($s5) /* CC64B8 80242CA8 28420064 */ slti $v0, $v0, 0x64 /* CC64BC 80242CAC 10400007 */ beqz $v0, .L80242CCC -/* CC64C0 80242CB0 00000000 */ nop +/* CC64C0 80242CB0 00000000 */ nop /* CC64C4 80242CB4 8FA2004C */ lw $v0, 0x4c($sp) /* CC64C8 80242CB8 24420032 */ addiu $v0, $v0, 0x32 /* CC64CC 80242CBC 2C4201A5 */ sltiu $v0, $v0, 0x1a5 @@ -178,7 +178,7 @@ glabel func_80242A6C_CC627C /* CC6514 80242D04 50600027 */ beql $v1, $zero, .L80242DA4 /* CC6518 80242D08 02A0202D */ daddu $a0, $s5, $zero /* CC651C 80242D0C 08090CCE */ j .L80243338 -/* CC6520 80242D10 00000000 */ nop +/* CC6520 80242D10 00000000 */ nop .L80242D14: /* CC6524 80242D14 2402000D */ addiu $v0, $zero, 0xd /* CC6528 80242D18 1062004D */ beq $v1, $v0, .L80242E50 @@ -188,7 +188,7 @@ glabel func_80242A6C_CC627C /* CC6538 80242D28 10620046 */ beq $v1, $v0, .L80242E44 /* CC653C 80242D2C 02A0202D */ daddu $a0, $s5, $zero /* CC6540 80242D30 08090CCE */ j .L80243338 -/* CC6544 80242D34 00000000 */ nop +/* CC6544 80242D34 00000000 */ nop .L80242D38: /* CC6548 80242D38 24020067 */ addiu $v0, $zero, 0x67 /* CC654C 80242D3C 10620158 */ beq $v1, $v0, .L802432A0 @@ -202,7 +202,7 @@ glabel func_80242A6C_CC627C /* CC656C 80242D5C 1062004F */ beq $v1, $v0, .L80242E9C /* CC6570 80242D60 24020002 */ addiu $v0, $zero, 2 /* CC6574 80242D64 08090CCE */ j .L80243338 -/* CC6578 80242D68 00000000 */ nop +/* CC6578 80242D68 00000000 */ nop .L80242D6C: /* CC657C 80242D6C 2404006F */ addiu $a0, $zero, 0x6f /* CC6580 80242D70 10640166 */ beq $v1, $a0, .L8024330C @@ -212,13 +212,13 @@ glabel func_80242A6C_CC627C /* CC6590 80242D80 10620156 */ beq $v1, $v0, .L802432DC /* CC6594 80242D84 2402001E */ addiu $v0, $zero, 0x1e /* CC6598 80242D88 08090CCE */ j .L80243338 -/* CC659C 80242D8C 00000000 */ nop +/* CC659C 80242D8C 00000000 */ nop .L80242D90: /* CC65A0 80242D90 240200C8 */ addiu $v0, $zero, 0xc8 /* CC65A4 80242D94 10620166 */ beq $v1, $v0, .L80243330 -/* CC65A8 80242D98 00000000 */ nop +/* CC65A8 80242D98 00000000 */ nop /* CC65AC 80242D9C 08090CCE */ j .L80243338 -/* CC65B0 80242DA0 00000000 */ nop +/* CC65B0 80242DA0 00000000 */ nop .L80242DA4: /* CC65B4 80242DA4 0260282D */ daddu $a1, $s3, $zero /* CC65B8 80242DA8 0C012568 */ jal func_800495A0 @@ -233,7 +233,7 @@ glabel func_80242A6C_CC627C /* CC65DC 80242DCC 44801800 */ mtc1 $zero, $f3 /* CC65E0 80242DD0 46000021 */ cvt.d.s $f0, $f0 /* CC65E4 80242DD4 4622003E */ c.le.d $f0, $f2 -/* CC65E8 80242DD8 00000000 */ nop +/* CC65E8 80242DD8 00000000 */ nop /* CC65EC 80242DDC 45000005 */ bc1f .L80242DF4 /* CC65F0 80242DE0 2403FDFF */ addiu $v1, $zero, -0x201 /* CC65F4 80242DE4 8E220000 */ lw $v0, ($s1) @@ -254,10 +254,10 @@ glabel func_80242A6C_CC627C /* CC6620 80242E10 0C0125AE */ jal func_800496B8 /* CC6624 80242E14 0280302D */ daddu $a2, $s4, $zero /* CC6628 80242E18 08090CCE */ j .L80243338 -/* CC662C 80242E1C 00000000 */ nop +/* CC662C 80242E1C 00000000 */ nop .L80242E20: /* CC6630 80242E20 0260282D */ daddu $a1, $s3, $zero -/* CC6634 80242E24 0C0126D1 */ jal func_80049B44 +/* CC6634 80242E24 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CC6638 80242E28 0280302D */ daddu $a2, $s4, $zero .L80242E2C: /* CC663C 80242E2C 02A0202D */ daddu $a0, $s5, $zero @@ -265,7 +265,7 @@ glabel func_80242A6C_CC627C /* CC6644 80242E34 0C012701 */ jal func_80049C04 /* CC6648 80242E38 0280302D */ daddu $a2, $s4, $zero /* CC664C 80242E3C 08090CCE */ j .L80243338 -/* CC6650 80242E40 00000000 */ nop +/* CC6650 80242E40 00000000 */ nop .L80242E44: /* CC6654 80242E44 0260282D */ daddu $a1, $s3, $zero /* CC6658 80242E48 0C0908A6 */ jal func_80242298_CC5AA8 @@ -284,18 +284,18 @@ glabel func_80242A6C_CC627C /* CC6684 80242E74 0C090912 */ jal func_80242448_CC5C58 /* CC6688 80242E78 0280302D */ daddu $a2, $s4, $zero /* CC668C 80242E7C 08090CCE */ j .L80243338 -/* CC6690 80242E80 00000000 */ nop +/* CC6690 80242E80 00000000 */ nop .L80242E84: /* CC6694 80242E84 02A0202D */ daddu $a0, $s5, $zero /* CC6698 80242E88 0260282D */ daddu $a1, $s3, $zero /* CC669C 80242E8C 0C09096B */ jal func_802425AC_CC5DBC /* CC66A0 80242E90 0280302D */ daddu $a2, $s4, $zero /* CC66A4 80242E94 08090CCE */ j .L80243338 -/* CC66A8 80242E98 00000000 */ nop +/* CC66A8 80242E98 00000000 */ nop .L80242E9C: /* CC66AC 80242E9C 8E430094 */ lw $v1, 0x94($s2) /* CC66B0 80242EA0 14620125 */ bne $v1, $v0, .L80243338 -/* CC66B4 80242EA4 00000000 */ nop +/* CC66B4 80242EA4 00000000 */ nop /* CC66B8 80242EA8 0C00FB3A */ jal get_enemy /* CC66BC 80242EAC 8E440098 */ lw $a0, 0x98($s2) /* CC66C0 80242EB0 0C00EABB */ jal get_npc_unsafe @@ -305,9 +305,9 @@ glabel func_80242A6C_CC627C /* CC66D0 80242EC0 D4227AE8 */ ldc1 $f2, %lo(D_80247AE8)($at) /* CC66D4 80242EC4 46000021 */ cvt.d.s $f0, $f0 /* CC66D8 80242EC8 4622003C */ c.lt.d $f0, $f2 -/* CC66DC 80242ECC 00000000 */ nop +/* CC66DC 80242ECC 00000000 */ nop /* CC66E0 80242ED0 45000008 */ bc1f .L80242EF4 -/* CC66E4 80242ED4 00000000 */ nop +/* CC66E4 80242ED4 00000000 */ nop /* CC66E8 80242ED8 C4400038 */ lwc1 $f0, 0x38($v0) /* CC66EC 80242EDC 3C014028 */ lui $at, 0x4028 /* CC66F0 80242EE0 44811800 */ mtc1 $at, $f3 @@ -390,7 +390,7 @@ glabel func_80242A6C_CC627C /* CC6814 80243004 44801800 */ mtc1 $zero, $f3 /* CC6818 80243008 46000021 */ cvt.d.s $f0, $f0 /* CC681C 8024300C 4620103C */ c.lt.d $f2, $f0 -/* CC6820 80243010 00000000 */ nop +/* CC6820 80243010 00000000 */ nop /* CC6824 80243014 4500001F */ bc1f .L80243094 /* CC6828 80243018 27A50058 */ addiu $a1, $sp, 0x58 /* CC682C 8024301C C6200038 */ lwc1 $f0, 0x38($s1) @@ -405,13 +405,13 @@ glabel func_80242A6C_CC627C /* CC6850 80243040 E7A00014 */ swc1 $f0, 0x14($sp) /* CC6854 80243044 862200A8 */ lh $v0, 0xa8($s1) /* CC6858 80243048 44820000 */ mtc1 $v0, $f0 -/* CC685C 8024304C 00000000 */ nop +/* CC685C 8024304C 00000000 */ nop /* CC6860 80243050 46800020 */ cvt.s.w $f0, $f0 /* CC6864 80243054 E7A00018 */ swc1 $f0, 0x18($sp) /* CC6868 80243058 862200A6 */ lh $v0, 0xa6($s1) /* CC686C 8024305C 27A6005C */ addiu $a2, $sp, 0x5c /* CC6870 80243060 44820000 */ mtc1 $v0, $f0 -/* CC6874 80243064 00000000 */ nop +/* CC6874 80243064 00000000 */ nop /* CC6878 80243068 46800020 */ cvt.s.w $f0, $f0 /* CC687C 8024306C E7A0001C */ swc1 $f0, 0x1c($sp) /* CC6880 80243070 8E240080 */ lw $a0, 0x80($s1) @@ -429,7 +429,7 @@ glabel func_80242A6C_CC627C /* CC68AC 8024309C 4480B800 */ mtc1 $zero, $f23 /* CC68B0 802430A0 46000021 */ cvt.d.s $f0, $f0 /* CC68B4 802430A4 4636003C */ c.lt.d $f0, $f22 -/* CC68B8 802430A8 00000000 */ nop +/* CC68B8 802430A8 00000000 */ nop /* CC68BC 802430AC 45000074 */ bc1f .L80243280 /* CC68C0 802430B0 27A50058 */ addiu $a1, $sp, 0x58 /* CC68C4 802430B4 27A6005C */ addiu $a2, $sp, 0x5c @@ -460,7 +460,7 @@ glabel func_80242A6C_CC627C /* CC6928 80243118 0C0372DF */ jal func_800DCB7C /* CC692C 8024311C 27A70060 */ addiu $a3, $sp, 0x60 /* CC6930 80243120 10400057 */ beqz $v0, .L80243280 -/* CC6934 80243124 00000000 */ nop +/* CC6934 80243124 00000000 */ nop /* CC6938 80243128 C620001C */ lwc1 $f0, 0x1c($s1) /* CC693C 8024312C C7A20064 */ lwc1 $f2, 0x64($sp) /* CC6940 80243130 46000005 */ abs.s $f0, $f0 @@ -468,9 +468,9 @@ glabel func_80242A6C_CC627C /* CC6948 80243138 46340000 */ add.d $f0, $f0, $f20 /* CC694C 8024313C 460010A1 */ cvt.d.s $f2, $f2 /* CC6950 80243140 4620103E */ c.le.d $f2, $f0 -/* CC6954 80243144 00000000 */ nop +/* CC6954 80243144 00000000 */ nop /* CC6958 80243148 4500004D */ bc1f .L80243280 -/* CC695C 8024314C 00000000 */ nop +/* CC695C 8024314C 00000000 */ nop /* CC6960 80243150 C7A0005C */ lwc1 $f0, 0x5c($sp) /* CC6964 80243154 E620003C */ swc1 $f0, 0x3c($s1) /* CC6968 80243158 8E4200D0 */ lw $v0, 0xd0($s2) @@ -504,7 +504,7 @@ glabel func_80242A6C_CC627C /* CC69D8 802431C8 C620003C */ lwc1 $f0, 0x3c($s1) /* CC69DC 802431CC 46000021 */ cvt.d.s $f0, $f0 /* CC69E0 802431D0 4636003E */ c.le.d $f0, $f22 -/* CC69E4 802431D4 00000000 */ nop +/* CC69E4 802431D4 00000000 */ nop /* CC69E8 802431D8 4501000D */ bc1t .L80243210 /* CC69EC 802431DC 2403FFF7 */ addiu $v1, $zero, -9 /* CC69F0 802431E0 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s index ce2b28ea9f..b39745d448 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s @@ -55,7 +55,7 @@ glabel func_802424D8_CD97B8 /* CD987C 8024259C 8E2200B0 */ lw $v0, 0xb0($s1) /* CD9880 802425A0 30420004 */ andi $v0, $v0, 4 /* CD9884 802425A4 10400047 */ beqz $v0, .L802426C4 -/* CD9888 802425A8 00000000 */ nop +/* CD9888 802425A8 00000000 */ nop .L802425AC: /* CD988C 802425AC AE600070 */ sw $zero, 0x70($s3) /* CD9890 802425B0 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802424D8_CD97B8 /* CD9934 80242654 24020028 */ addiu $v0, $zero, 0x28 /* CD9938 80242658 AFA2001C */ sw $v0, 0x1c($sp) /* CD993C 8024265C 44833000 */ mtc1 $v1, $f6 -/* CD9940 80242660 00000000 */ nop +/* CD9940 80242660 00000000 */ nop /* CD9944 80242664 468031A0 */ cvt.s.w $f6, $f6 /* CD9948 80242668 44073000 */ mfc1 $a3, $f6 /* CD994C 8024266C 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802424D8_CD97B8 /* CD9A04 80242724 10600015 */ beqz $v1, .L8024277C /* CD9A08 80242728 0260202D */ daddu $a0, $s3, $zero /* CD9A0C 8024272C 08090A21 */ j .L80242884 -/* CD9A10 80242730 00000000 */ nop +/* CD9A10 80242730 00000000 */ nop .L80242734: /* CD9A14 80242734 1062001C */ beq $v1, $v0, .L802427A8 /* CD9A18 80242738 24020003 */ addiu $v0, $zero, 3 /* CD9A1C 8024273C 10620035 */ beq $v1, $v0, .L80242814 /* CD9A20 80242740 0260202D */ daddu $a0, $s3, $zero /* CD9A24 80242744 08090A21 */ j .L80242884 -/* CD9A28 80242748 00000000 */ nop +/* CD9A28 80242748 00000000 */ nop .L8024274C: /* CD9A2C 8024274C 2402000E */ addiu $v0, $zero, 0xe /* CD9A30 80242750 1062003F */ beq $v1, $v0, .L80242850 @@ -177,9 +177,9 @@ glabel func_802424D8_CD97B8 /* CD9A44 80242764 10620040 */ beq $v1, $v0, .L80242868 /* CD9A48 80242768 24020063 */ addiu $v0, $zero, 0x63 /* CD9A4C 8024276C 10620043 */ beq $v1, $v0, .L8024287C -/* CD9A50 80242770 00000000 */ nop +/* CD9A50 80242770 00000000 */ nop /* CD9A54 80242774 08090A21 */ j .L80242884 -/* CD9A58 80242778 00000000 */ nop +/* CD9A58 80242778 00000000 */ nop .L8024277C: /* CD9A5C 8024277C 0280282D */ daddu $a1, $s4, $zero /* CD9A60 80242780 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802424D8_CD97B8 /* CD9A78 80242798 0C0125AE */ jal func_800496B8 /* CD9A7C 8024279C 02A0302D */ daddu $a2, $s5, $zero /* CD9A80 802427A0 08090A21 */ j .L80242884 -/* CD9A84 802427A4 00000000 */ nop +/* CD9A84 802427A4 00000000 */ nop .L802427A8: /* CD9A88 802427A8 0260202D */ daddu $a0, $s3, $zero /* CD9A8C 802427AC 0280282D */ daddu $a1, $s4, $zero -/* CD9A90 802427B0 0C0126D1 */ jal func_80049B44 +/* CD9A90 802427B0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CD9A94 802427B4 02A0302D */ daddu $a2, $s5, $zero /* CD9A98 802427B8 8E230088 */ lw $v1, 0x88($s1) /* CD9A9C 802427BC 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802424D8_CD97B8 /* CD9AF8 80242818 0C012701 */ jal func_80049C04 /* CD9AFC 8024281C 02A0302D */ daddu $a2, $s5, $zero /* CD9B00 80242820 08090A21 */ j .L80242884 -/* CD9B04 80242824 00000000 */ nop +/* CD9B04 80242824 00000000 */ nop .L80242828: /* CD9B08 80242828 0260202D */ daddu $a0, $s3, $zero /* CD9B0C 8024282C 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802424D8_CD97B8 /* CD9B20 80242840 0C090870 */ jal func_802421C0_CD94A0 /* CD9B24 80242844 02A0302D */ daddu $a2, $s5, $zero /* CD9B28 80242848 08090A21 */ j .L80242884 -/* CD9B2C 8024284C 00000000 */ nop +/* CD9B2C 8024284C 00000000 */ nop .L80242850: /* CD9B30 80242850 0260202D */ daddu $a0, $s3, $zero /* CD9B34 80242854 0280282D */ daddu $a1, $s4, $zero /* CD9B38 80242858 0C0908BD */ jal func_802422F4_CD95D4 /* CD9B3C 8024285C 02A0302D */ daddu $a2, $s5, $zero /* CD9B40 80242860 08090A21 */ j .L80242884 -/* CD9B44 80242864 00000000 */ nop +/* CD9B44 80242864 00000000 */ nop .L80242868: /* CD9B48 80242868 0280282D */ daddu $a1, $s4, $zero /* CD9B4C 8024286C 0C090916 */ jal func_80242458_CD9738 /* CD9B50 80242870 02A0302D */ daddu $a2, $s5, $zero /* CD9B54 80242874 08090A21 */ j .L80242884 -/* CD9B58 80242878 00000000 */ nop +/* CD9B58 80242878 00000000 */ nop .L8024287C: /* CD9B5C 8024287C 0C0129CF */ jal func_8004A73C /* CD9B60 80242880 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802424D8_CD97B8 /* CD9BB4 802428D4 00220821 */ addu $at, $at, $v0 /* CD9BB8 802428D8 8C225360 */ lw $v0, %lo(D_80245360)($at) /* CD9BBC 802428DC 00400008 */ jr $v0 -/* CD9BC0 802428E0 00000000 */ nop +/* CD9BC0 802428E0 00000000 */ nop /* CD9BC4 802428E4 8E420028 */ lw $v0, 0x28($s2) /* CD9BC8 802428E8 24420001 */ addiu $v0, $v0, 1 /* CD9BCC 802428EC AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s index c9259e4003..42e24f8040 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s @@ -55,7 +55,7 @@ glabel func_80242918_CD9BF8 /* CD9CBC 802429DC 8E430094 */ lw $v1, 0x94($s2) /* CD9CC0 802429E0 24020064 */ addiu $v0, $zero, 0x64 /* CD9CC4 802429E4 1462001C */ bne $v1, $v0, .L80242A58 -/* CD9CC8 802429E8 00000000 */ nop +/* CD9CC8 802429E8 00000000 */ nop .L802429EC: /* CD9CCC 802429EC 24020064 */ addiu $v0, $zero, 0x64 /* CD9CD0 802429F0 2404F7FF */ addiu $a0, $zero, -0x801 @@ -122,7 +122,7 @@ glabel func_80242918_CD9BF8 /* CD9DBC 80242ADC 24020028 */ addiu $v0, $zero, 0x28 /* CD9DC0 80242AE0 AFA2001C */ sw $v0, 0x1c($sp) /* CD9DC4 80242AE4 44834000 */ mtc1 $v1, $f8 -/* CD9DC8 80242AE8 00000000 */ nop +/* CD9DC8 80242AE8 00000000 */ nop /* CD9DCC 80242AEC 46804220 */ cvt.s.w $f8, $f8 /* CD9DD0 80242AF0 44074000 */ mfc1 $a3, $f8 /* CD9DD4 80242AF4 27A20048 */ addiu $v0, $sp, 0x48 @@ -153,7 +153,7 @@ glabel func_80242918_CD9BF8 /* CD9E30 80242B50 8EA20070 */ lw $v0, 0x70($s5) /* CD9E34 80242B54 28420064 */ slti $v0, $v0, 0x64 /* CD9E38 80242B58 10400007 */ beqz $v0, .L80242B78 -/* CD9E3C 80242B5C 00000000 */ nop +/* CD9E3C 80242B5C 00000000 */ nop /* CD9E40 80242B60 8FA2004C */ lw $v0, 0x4c($sp) /* CD9E44 80242B64 24420032 */ addiu $v0, $v0, 0x32 /* CD9E48 80242B68 2C4201A5 */ sltiu $v0, $v0, 0x1a5 @@ -178,7 +178,7 @@ glabel func_80242918_CD9BF8 /* CD9E90 80242BB0 50600027 */ beql $v1, $zero, .L80242C50 /* CD9E94 80242BB4 02A0202D */ daddu $a0, $s5, $zero /* CD9E98 80242BB8 08090C79 */ j .L802431E4 -/* CD9E9C 80242BBC 00000000 */ nop +/* CD9E9C 80242BBC 00000000 */ nop .L80242BC0: /* CD9EA0 80242BC0 2402000D */ addiu $v0, $zero, 0xd /* CD9EA4 80242BC4 1062004D */ beq $v1, $v0, .L80242CFC @@ -188,7 +188,7 @@ glabel func_80242918_CD9BF8 /* CD9EB4 80242BD4 10620046 */ beq $v1, $v0, .L80242CF0 /* CD9EB8 80242BD8 02A0202D */ daddu $a0, $s5, $zero /* CD9EBC 80242BDC 08090C79 */ j .L802431E4 -/* CD9EC0 80242BE0 00000000 */ nop +/* CD9EC0 80242BE0 00000000 */ nop .L80242BE4: /* CD9EC4 80242BE4 24020067 */ addiu $v0, $zero, 0x67 /* CD9EC8 80242BE8 10620158 */ beq $v1, $v0, .L8024314C @@ -202,7 +202,7 @@ glabel func_80242918_CD9BF8 /* CD9EE8 80242C08 1062004F */ beq $v1, $v0, .L80242D48 /* CD9EEC 80242C0C 24020002 */ addiu $v0, $zero, 2 /* CD9EF0 80242C10 08090C79 */ j .L802431E4 -/* CD9EF4 80242C14 00000000 */ nop +/* CD9EF4 80242C14 00000000 */ nop .L80242C18: /* CD9EF8 80242C18 2404006F */ addiu $a0, $zero, 0x6f /* CD9EFC 80242C1C 10640166 */ beq $v1, $a0, .L802431B8 @@ -212,13 +212,13 @@ glabel func_80242918_CD9BF8 /* CD9F0C 80242C2C 10620156 */ beq $v1, $v0, .L80243188 /* CD9F10 80242C30 2402001E */ addiu $v0, $zero, 0x1e /* CD9F14 80242C34 08090C79 */ j .L802431E4 -/* CD9F18 80242C38 00000000 */ nop +/* CD9F18 80242C38 00000000 */ nop .L80242C3C: /* CD9F1C 80242C3C 240200C8 */ addiu $v0, $zero, 0xc8 /* CD9F20 80242C40 10620166 */ beq $v1, $v0, .L802431DC -/* CD9F24 80242C44 00000000 */ nop +/* CD9F24 80242C44 00000000 */ nop /* CD9F28 80242C48 08090C79 */ j .L802431E4 -/* CD9F2C 80242C4C 00000000 */ nop +/* CD9F2C 80242C4C 00000000 */ nop .L80242C50: /* CD9F30 80242C50 0260282D */ daddu $a1, $s3, $zero /* CD9F34 80242C54 0C012568 */ jal func_800495A0 @@ -233,7 +233,7 @@ glabel func_80242918_CD9BF8 /* CD9F58 80242C78 44801800 */ mtc1 $zero, $f3 /* CD9F5C 80242C7C 46000021 */ cvt.d.s $f0, $f0 /* CD9F60 80242C80 4622003E */ c.le.d $f0, $f2 -/* CD9F64 80242C84 00000000 */ nop +/* CD9F64 80242C84 00000000 */ nop /* CD9F68 80242C88 45000005 */ bc1f .L80242CA0 /* CD9F6C 80242C8C 2403FDFF */ addiu $v1, $zero, -0x201 /* CD9F70 80242C90 8E220000 */ lw $v0, ($s1) @@ -254,10 +254,10 @@ glabel func_80242918_CD9BF8 /* CD9F9C 80242CBC 0C0125AE */ jal func_800496B8 /* CD9FA0 80242CC0 0280302D */ daddu $a2, $s4, $zero /* CD9FA4 80242CC4 08090C79 */ j .L802431E4 -/* CD9FA8 80242CC8 00000000 */ nop +/* CD9FA8 80242CC8 00000000 */ nop .L80242CCC: /* CD9FAC 80242CCC 0260282D */ daddu $a1, $s3, $zero -/* CD9FB0 80242CD0 0C0126D1 */ jal func_80049B44 +/* CD9FB0 80242CD0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CD9FB4 80242CD4 0280302D */ daddu $a2, $s4, $zero .L80242CD8: /* CD9FB8 80242CD8 02A0202D */ daddu $a0, $s5, $zero @@ -265,7 +265,7 @@ glabel func_80242918_CD9BF8 /* CD9FC0 80242CE0 0C012701 */ jal func_80049C04 /* CD9FC4 80242CE4 0280302D */ daddu $a2, $s4, $zero /* CD9FC8 80242CE8 08090C79 */ j .L802431E4 -/* CD9FCC 80242CEC 00000000 */ nop +/* CD9FCC 80242CEC 00000000 */ nop .L80242CF0: /* CD9FD0 80242CF0 0260282D */ daddu $a1, $s3, $zero /* CD9FD4 80242CF4 0C090851 */ jal func_80242144_CD9424 @@ -284,18 +284,18 @@ glabel func_80242918_CD9BF8 /* CDA000 80242D20 0C0908BD */ jal func_802422F4_CD95D4 /* CDA004 80242D24 0280302D */ daddu $a2, $s4, $zero /* CDA008 80242D28 08090C79 */ j .L802431E4 -/* CDA00C 80242D2C 00000000 */ nop +/* CDA00C 80242D2C 00000000 */ nop .L80242D30: /* CDA010 80242D30 02A0202D */ daddu $a0, $s5, $zero /* CDA014 80242D34 0260282D */ daddu $a1, $s3, $zero /* CDA018 80242D38 0C090916 */ jal func_80242458_CD9738 /* CDA01C 80242D3C 0280302D */ daddu $a2, $s4, $zero /* CDA020 80242D40 08090C79 */ j .L802431E4 -/* CDA024 80242D44 00000000 */ nop +/* CDA024 80242D44 00000000 */ nop .L80242D48: /* CDA028 80242D48 8E430094 */ lw $v1, 0x94($s2) /* CDA02C 80242D4C 14620125 */ bne $v1, $v0, .L802431E4 -/* CDA030 80242D50 00000000 */ nop +/* CDA030 80242D50 00000000 */ nop /* CDA034 80242D54 0C00FB3A */ jal get_enemy /* CDA038 80242D58 8E440098 */ lw $a0, 0x98($s2) /* CDA03C 80242D5C 0C00EABB */ jal get_npc_unsafe @@ -305,9 +305,9 @@ glabel func_80242918_CD9BF8 /* CDA04C 80242D6C D42253B8 */ ldc1 $f2, %lo(D_802453B8)($at) /* CDA050 80242D70 46000021 */ cvt.d.s $f0, $f0 /* CDA054 80242D74 4622003C */ c.lt.d $f0, $f2 -/* CDA058 80242D78 00000000 */ nop +/* CDA058 80242D78 00000000 */ nop /* CDA05C 80242D7C 45000008 */ bc1f .L80242DA0 -/* CDA060 80242D80 00000000 */ nop +/* CDA060 80242D80 00000000 */ nop /* CDA064 80242D84 C4400038 */ lwc1 $f0, 0x38($v0) /* CDA068 80242D88 3C014028 */ lui $at, 0x4028 /* CDA06C 80242D8C 44811800 */ mtc1 $at, $f3 @@ -390,7 +390,7 @@ glabel func_80242918_CD9BF8 /* CDA190 80242EB0 44801800 */ mtc1 $zero, $f3 /* CDA194 80242EB4 46000021 */ cvt.d.s $f0, $f0 /* CDA198 80242EB8 4620103C */ c.lt.d $f2, $f0 -/* CDA19C 80242EBC 00000000 */ nop +/* CDA19C 80242EBC 00000000 */ nop /* CDA1A0 80242EC0 4500001F */ bc1f .L80242F40 /* CDA1A4 80242EC4 27A50058 */ addiu $a1, $sp, 0x58 /* CDA1A8 80242EC8 C6200038 */ lwc1 $f0, 0x38($s1) @@ -405,13 +405,13 @@ glabel func_80242918_CD9BF8 /* CDA1CC 80242EEC E7A00014 */ swc1 $f0, 0x14($sp) /* CDA1D0 80242EF0 862200A8 */ lh $v0, 0xa8($s1) /* CDA1D4 80242EF4 44820000 */ mtc1 $v0, $f0 -/* CDA1D8 80242EF8 00000000 */ nop +/* CDA1D8 80242EF8 00000000 */ nop /* CDA1DC 80242EFC 46800020 */ cvt.s.w $f0, $f0 /* CDA1E0 80242F00 E7A00018 */ swc1 $f0, 0x18($sp) /* CDA1E4 80242F04 862200A6 */ lh $v0, 0xa6($s1) /* CDA1E8 80242F08 27A6005C */ addiu $a2, $sp, 0x5c /* CDA1EC 80242F0C 44820000 */ mtc1 $v0, $f0 -/* CDA1F0 80242F10 00000000 */ nop +/* CDA1F0 80242F10 00000000 */ nop /* CDA1F4 80242F14 46800020 */ cvt.s.w $f0, $f0 /* CDA1F8 80242F18 E7A0001C */ swc1 $f0, 0x1c($sp) /* CDA1FC 80242F1C 8E240080 */ lw $a0, 0x80($s1) @@ -429,7 +429,7 @@ glabel func_80242918_CD9BF8 /* CDA228 80242F48 4480B800 */ mtc1 $zero, $f23 /* CDA22C 80242F4C 46000021 */ cvt.d.s $f0, $f0 /* CDA230 80242F50 4636003C */ c.lt.d $f0, $f22 -/* CDA234 80242F54 00000000 */ nop +/* CDA234 80242F54 00000000 */ nop /* CDA238 80242F58 45000074 */ bc1f .L8024312C /* CDA23C 80242F5C 27A50058 */ addiu $a1, $sp, 0x58 /* CDA240 80242F60 27A6005C */ addiu $a2, $sp, 0x5c @@ -460,7 +460,7 @@ glabel func_80242918_CD9BF8 /* CDA2A4 80242FC4 0C0372DF */ jal func_800DCB7C /* CDA2A8 80242FC8 27A70060 */ addiu $a3, $sp, 0x60 /* CDA2AC 80242FCC 10400057 */ beqz $v0, .L8024312C -/* CDA2B0 80242FD0 00000000 */ nop +/* CDA2B0 80242FD0 00000000 */ nop /* CDA2B4 80242FD4 C620001C */ lwc1 $f0, 0x1c($s1) /* CDA2B8 80242FD8 C7A20064 */ lwc1 $f2, 0x64($sp) /* CDA2BC 80242FDC 46000005 */ abs.s $f0, $f0 @@ -468,9 +468,9 @@ glabel func_80242918_CD9BF8 /* CDA2C4 80242FE4 46340000 */ add.d $f0, $f0, $f20 /* CDA2C8 80242FE8 460010A1 */ cvt.d.s $f2, $f2 /* CDA2CC 80242FEC 4620103E */ c.le.d $f2, $f0 -/* CDA2D0 80242FF0 00000000 */ nop +/* CDA2D0 80242FF0 00000000 */ nop /* CDA2D4 80242FF4 4500004D */ bc1f .L8024312C -/* CDA2D8 80242FF8 00000000 */ nop +/* CDA2D8 80242FF8 00000000 */ nop /* CDA2DC 80242FFC C7A0005C */ lwc1 $f0, 0x5c($sp) /* CDA2E0 80243000 E620003C */ swc1 $f0, 0x3c($s1) /* CDA2E4 80243004 8E4200D0 */ lw $v0, 0xd0($s2) @@ -504,7 +504,7 @@ glabel func_80242918_CD9BF8 /* CDA354 80243074 C620003C */ lwc1 $f0, 0x3c($s1) /* CDA358 80243078 46000021 */ cvt.d.s $f0, $f0 /* CDA35C 8024307C 4636003E */ c.le.d $f0, $f22 -/* CDA360 80243080 00000000 */ nop +/* CDA360 80243080 00000000 */ nop /* CDA364 80243084 4501000D */ bc1t .L802430BC /* CDA368 80243088 2403FFF7 */ addiu $v1, $zero, -9 /* CDA36C 8024308C 8E220000 */ lw $v0, ($s1) @@ -614,6 +614,6 @@ glabel func_80242918_CD9BF8 /* CDA4E8 80243208 0000102D */ daddu $v0, $zero, $zero /* CDA4EC 8024320C 03E00008 */ jr $ra /* CDA4F0 80243210 27BD0098 */ addiu $sp, $sp, 0x98 -/* CDA4F4 80243214 00000000 */ nop -/* CDA4F8 80243218 00000000 */ nop -/* CDA4FC 8024321C 00000000 */ nop +/* CDA4F4 80243214 00000000 */ nop +/* CDA4F8 80243218 00000000 */ nop +/* CDA4FC 8024321C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s index b80aa46f45..441622212b 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s @@ -55,7 +55,7 @@ glabel func_80240728_CEE988 /* CEEA4C 802407EC 8E2200B0 */ lw $v0, 0xb0($s1) /* CEEA50 802407F0 30420004 */ andi $v0, $v0, 4 /* CEEA54 802407F4 10400047 */ beqz $v0, .L80240914 -/* CEEA58 802407F8 00000000 */ nop +/* CEEA58 802407F8 00000000 */ nop .L802407FC: /* CEEA5C 802407FC AE600070 */ sw $zero, 0x70($s3) /* CEEA60 80240800 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240728_CEE988 /* CEEB04 802408A4 24020028 */ addiu $v0, $zero, 0x28 /* CEEB08 802408A8 AFA2001C */ sw $v0, 0x1c($sp) /* CEEB0C 802408AC 44833000 */ mtc1 $v1, $f6 -/* CEEB10 802408B0 00000000 */ nop +/* CEEB10 802408B0 00000000 */ nop /* CEEB14 802408B4 468031A0 */ cvt.s.w $f6, $f6 /* CEEB18 802408B8 44073000 */ mfc1 $a3, $f6 /* CEEB1C 802408BC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240728_CEE988 /* CEEBD4 80240974 10600015 */ beqz $v1, .L802409CC /* CEEBD8 80240978 0260202D */ daddu $a0, $s3, $zero /* CEEBDC 8024097C 080902B5 */ j .L80240AD4 -/* CEEBE0 80240980 00000000 */ nop +/* CEEBE0 80240980 00000000 */ nop .L80240984: /* CEEBE4 80240984 1062001C */ beq $v1, $v0, .L802409F8 /* CEEBE8 80240988 24020003 */ addiu $v0, $zero, 3 /* CEEBEC 8024098C 10620035 */ beq $v1, $v0, .L80240A64 /* CEEBF0 80240990 0260202D */ daddu $a0, $s3, $zero /* CEEBF4 80240994 080902B5 */ j .L80240AD4 -/* CEEBF8 80240998 00000000 */ nop +/* CEEBF8 80240998 00000000 */ nop .L8024099C: /* CEEBFC 8024099C 2402000E */ addiu $v0, $zero, 0xe /* CEEC00 802409A0 1062003F */ beq $v1, $v0, .L80240AA0 @@ -177,9 +177,9 @@ glabel func_80240728_CEE988 /* CEEC14 802409B4 10620040 */ beq $v1, $v0, .L80240AB8 /* CEEC18 802409B8 24020063 */ addiu $v0, $zero, 0x63 /* CEEC1C 802409BC 10620043 */ beq $v1, $v0, .L80240ACC -/* CEEC20 802409C0 00000000 */ nop +/* CEEC20 802409C0 00000000 */ nop /* CEEC24 802409C4 080902B5 */ j .L80240AD4 -/* CEEC28 802409C8 00000000 */ nop +/* CEEC28 802409C8 00000000 */ nop .L802409CC: /* CEEC2C 802409CC 0280282D */ daddu $a1, $s4, $zero /* CEEC30 802409D0 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240728_CEE988 /* CEEC48 802409E8 0C0125AE */ jal func_800496B8 /* CEEC4C 802409EC 02A0302D */ daddu $a2, $s5, $zero /* CEEC50 802409F0 080902B5 */ j .L80240AD4 -/* CEEC54 802409F4 00000000 */ nop +/* CEEC54 802409F4 00000000 */ nop .L802409F8: /* CEEC58 802409F8 0260202D */ daddu $a0, $s3, $zero /* CEEC5C 802409FC 0280282D */ daddu $a1, $s4, $zero -/* CEEC60 80240A00 0C0126D1 */ jal func_80049B44 +/* CEEC60 80240A00 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CEEC64 80240A04 02A0302D */ daddu $a2, $s5, $zero /* CEEC68 80240A08 8E230088 */ lw $v1, 0x88($s1) /* CEEC6C 80240A0C 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240728_CEE988 /* CEECC8 80240A68 0C012701 */ jal func_80049C04 /* CEECCC 80240A6C 02A0302D */ daddu $a2, $s5, $zero /* CEECD0 80240A70 080902B5 */ j .L80240AD4 -/* CEECD4 80240A74 00000000 */ nop +/* CEECD4 80240A74 00000000 */ nop .L80240A78: /* CEECD8 80240A78 0260202D */ daddu $a0, $s3, $zero /* CEECDC 80240A7C 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240728_CEE988 /* CEECF0 80240A90 0C090104 */ jal func_80240410_CEE670 /* CEECF4 80240A94 02A0302D */ daddu $a2, $s5, $zero /* CEECF8 80240A98 080902B5 */ j .L80240AD4 -/* CEECFC 80240A9C 00000000 */ nop +/* CEECFC 80240A9C 00000000 */ nop .L80240AA0: /* CEED00 80240AA0 0260202D */ daddu $a0, $s3, $zero /* CEED04 80240AA4 0280282D */ daddu $a1, $s4, $zero /* CEED08 80240AA8 0C090151 */ jal func_80240544_CEE7A4 /* CEED0C 80240AAC 02A0302D */ daddu $a2, $s5, $zero /* CEED10 80240AB0 080902B5 */ j .L80240AD4 -/* CEED14 80240AB4 00000000 */ nop +/* CEED14 80240AB4 00000000 */ nop .L80240AB8: /* CEED18 80240AB8 0280282D */ daddu $a1, $s4, $zero /* CEED1C 80240ABC 0C0901AA */ jal func_802406A8_CEE908 /* CEED20 80240AC0 02A0302D */ daddu $a2, $s5, $zero /* CEED24 80240AC4 080902B5 */ j .L80240AD4 -/* CEED28 80240AC8 00000000 */ nop +/* CEED28 80240AC8 00000000 */ nop .L80240ACC: /* CEED2C 80240ACC 0C0129CF */ jal func_8004A73C /* CEED30 80240AD0 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240728_CEE988 /* CEED84 80240B24 00220821 */ addu $at, $at, $v0 /* CEED88 80240B28 8C222688 */ lw $v0, %lo(D_80242688)($at) /* CEED8C 80240B2C 00400008 */ jr $v0 -/* CEED90 80240B30 00000000 */ nop +/* CEED90 80240B30 00000000 */ nop /* CEED94 80240B34 8E420028 */ lw $v0, 0x28($s2) /* CEED98 80240B38 24420001 */ addiu $v0, $v0, 1 /* CEED9C 80240B3C AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_8024023C_E1E69C.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_8024023C_E1E69C.s deleted file mode 100644 index f181a0032f..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_8024023C_E1E69C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_E1E69C -/* E1E69C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E1E6A0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* E1E6A4 80240244 0080802D */ daddu $s0, $a0, $zero -/* E1E6A8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* E1E6AC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* E1E6B0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* E1E6B4 80240254 0C0B210B */ jal get_float_variable -/* E1E6B8 80240258 8C450000 */ lw $a1, ($v0) -/* E1E6BC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* E1E6C0 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* E1E6C4 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* E1E6C8 80240268 44060000 */ mfc1 $a2, $f0 -/* E1E6CC 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* E1E6D0 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* E1E6D4 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* E1E6D8 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* E1E6DC 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* E1E6E0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* E1E6E4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* E1E6E8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* E1E6EC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* E1E6F0 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* E1E6F4 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* E1E6F8 80240298 0C0B2190 */ jal set_float_variable -/* E1E6FC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E1E700 802402A0 0200202D */ daddu $a0, $s0, $zero -/* E1E704 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* E1E708 802402A8 4406A000 */ mfc1 $a2, $f20 -/* E1E70C 802402AC 0C0B2190 */ jal set_float_variable -/* E1E710 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E1E714 802402B4 0200202D */ daddu $a0, $s0, $zero -/* E1E718 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* E1E71C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* E1E720 802402C0 0C0B2190 */ jal set_float_variable -/* E1E724 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E1E728 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* E1E72C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* E1E730 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* E1E734 802402D4 24020002 */ addiu $v0, $zero, 2 -/* E1E738 802402D8 03E00008 */ jr $ra -/* E1E73C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s index 38181fb5d4..73194442a1 100644 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -55,7 +55,7 @@ glabel func_802403D4_97BA04 /* 97BAC8 80240498 8E2200B0 */ lw $v0, 0xb0($s1) /* 97BACC 8024049C 30420004 */ andi $v0, $v0, 4 /* 97BAD0 802404A0 10400047 */ beqz $v0, .L802405C0 -/* 97BAD4 802404A4 00000000 */ nop +/* 97BAD4 802404A4 00000000 */ nop .L802404A8: /* 97BAD8 802404A8 AE600070 */ sw $zero, 0x70($s3) /* 97BADC 802404AC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802403D4_97BA04 /* 97BB80 80240550 24020028 */ addiu $v0, $zero, 0x28 /* 97BB84 80240554 AFA2001C */ sw $v0, 0x1c($sp) /* 97BB88 80240558 44833000 */ mtc1 $v1, $f6 -/* 97BB8C 8024055C 00000000 */ nop +/* 97BB8C 8024055C 00000000 */ nop /* 97BB90 80240560 468031A0 */ cvt.s.w $f6, $f6 /* 97BB94 80240564 44073000 */ mfc1 $a3, $f6 /* 97BB98 80240568 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802403D4_97BA04 /* 97BC50 80240620 10600015 */ beqz $v1, .L80240678 /* 97BC54 80240624 0260202D */ daddu $a0, $s3, $zero /* 97BC58 80240628 080901E0 */ j .L80240780 -/* 97BC5C 8024062C 00000000 */ nop +/* 97BC5C 8024062C 00000000 */ nop .L80240630: /* 97BC60 80240630 1062001C */ beq $v1, $v0, .L802406A4 /* 97BC64 80240634 24020003 */ addiu $v0, $zero, 3 /* 97BC68 80240638 10620035 */ beq $v1, $v0, .L80240710 /* 97BC6C 8024063C 0260202D */ daddu $a0, $s3, $zero /* 97BC70 80240640 080901E0 */ j .L80240780 -/* 97BC74 80240644 00000000 */ nop +/* 97BC74 80240644 00000000 */ nop .L80240648: /* 97BC78 80240648 2402000E */ addiu $v0, $zero, 0xe /* 97BC7C 8024064C 1062003F */ beq $v1, $v0, .L8024074C @@ -177,9 +177,9 @@ glabel func_802403D4_97BA04 /* 97BC90 80240660 10620040 */ beq $v1, $v0, .L80240764 /* 97BC94 80240664 24020063 */ addiu $v0, $zero, 0x63 /* 97BC98 80240668 10620043 */ beq $v1, $v0, .L80240778 -/* 97BC9C 8024066C 00000000 */ nop +/* 97BC9C 8024066C 00000000 */ nop /* 97BCA0 80240670 080901E0 */ j .L80240780 -/* 97BCA4 80240674 00000000 */ nop +/* 97BCA4 80240674 00000000 */ nop .L80240678: /* 97BCA8 80240678 0280282D */ daddu $a1, $s4, $zero /* 97BCAC 8024067C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802403D4_97BA04 /* 97BCC4 80240694 0C0125AE */ jal func_800496B8 /* 97BCC8 80240698 02A0302D */ daddu $a2, $s5, $zero /* 97BCCC 8024069C 080901E0 */ j .L80240780 -/* 97BCD0 802406A0 00000000 */ nop +/* 97BCD0 802406A0 00000000 */ nop .L802406A4: /* 97BCD4 802406A4 0260202D */ daddu $a0, $s3, $zero /* 97BCD8 802406A8 0280282D */ daddu $a1, $s4, $zero -/* 97BCDC 802406AC 0C0126D1 */ jal func_80049B44 +/* 97BCDC 802406AC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 97BCE0 802406B0 02A0302D */ daddu $a2, $s5, $zero /* 97BCE4 802406B4 8E230088 */ lw $v1, 0x88($s1) /* 97BCE8 802406B8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802403D4_97BA04 /* 97BD44 80240714 0C012701 */ jal func_80049C04 /* 97BD48 80240718 02A0302D */ daddu $a2, $s5, $zero /* 97BD4C 8024071C 080901E0 */ j .L80240780 -/* 97BD50 80240720 00000000 */ nop +/* 97BD50 80240720 00000000 */ nop .L80240724: /* 97BD54 80240724 0260202D */ daddu $a0, $s3, $zero /* 97BD58 80240728 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802403D4_97BA04 /* 97BD6C 8024073C 0C09002F */ jal func_802400BC_97B6EC /* 97BD70 80240740 02A0302D */ daddu $a2, $s5, $zero /* 97BD74 80240744 080901E0 */ j .L80240780 -/* 97BD78 80240748 00000000 */ nop +/* 97BD78 80240748 00000000 */ nop .L8024074C: /* 97BD7C 8024074C 0260202D */ daddu $a0, $s3, $zero /* 97BD80 80240750 0280282D */ daddu $a1, $s4, $zero /* 97BD84 80240754 0C09007C */ jal func_802401F0_97B820 /* 97BD88 80240758 02A0302D */ daddu $a2, $s5, $zero /* 97BD8C 8024075C 080901E0 */ j .L80240780 -/* 97BD90 80240760 00000000 */ nop +/* 97BD90 80240760 00000000 */ nop .L80240764: /* 97BD94 80240764 0280282D */ daddu $a1, $s4, $zero /* 97BD98 80240768 0C0900D5 */ jal isk_04_set_script_owner_npc_col_height /* 97BD9C 8024076C 02A0302D */ daddu $a2, $s5, $zero /* 97BDA0 80240770 080901E0 */ j .L80240780 -/* 97BDA4 80240774 00000000 */ nop +/* 97BDA4 80240774 00000000 */ nop .L80240778: /* 97BDA8 80240778 0C0129CF */ jal func_8004A73C /* 97BDAC 8024077C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802403D4_97BA04 /* 97BE00 802407D0 00220821 */ addu $at, $at, $v0 /* 97BE04 802407D4 8C222438 */ lw $v0, %lo(D_80242438)($at) /* 97BE08 802407D8 00400008 */ jr $v0 -/* 97BE0C 802407DC 00000000 */ nop +/* 97BE0C 802407DC 00000000 */ nop /* 97BE10 802407E0 8E420028 */ lw $v0, 0x28($s2) /* 97BE14 802407E4 24420001 */ addiu $v0, $v0, 1 /* 97BE18 802407E8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s index be31fafea9..f10558e79e 100644 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -55,7 +55,7 @@ glabel func_80240394_9851C4 /* 985288 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 98528C 8024045C 30420004 */ andi $v0, $v0, 4 /* 985290 80240460 10400047 */ beqz $v0, .L80240580 -/* 985294 80240464 00000000 */ nop +/* 985294 80240464 00000000 */ nop .L80240468: /* 985298 80240468 AE600070 */ sw $zero, 0x70($s3) /* 98529C 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_9851C4 /* 985340 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 985344 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 985348 80240518 44833000 */ mtc1 $v1, $f6 -/* 98534C 8024051C 00000000 */ nop +/* 98534C 8024051C 00000000 */ nop /* 985350 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 985354 80240524 44073000 */ mfc1 $a3, $f6 /* 985358 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_9851C4 /* 985410 802405E0 10600015 */ beqz $v1, .L80240638 /* 985414 802405E4 0260202D */ daddu $a0, $s3, $zero /* 985418 802405E8 080901D0 */ j .L80240740 -/* 98541C 802405EC 00000000 */ nop +/* 98541C 802405EC 00000000 */ nop .L802405F0: /* 985420 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 985424 802405F4 24020003 */ addiu $v0, $zero, 3 /* 985428 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 98542C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 985430 80240600 080901D0 */ j .L80240740 -/* 985434 80240604 00000000 */ nop +/* 985434 80240604 00000000 */ nop .L80240608: /* 985438 80240608 2402000E */ addiu $v0, $zero, 0xe /* 98543C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_9851C4 /* 985450 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 985454 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 985458 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 98545C 8024062C 00000000 */ nop +/* 98545C 8024062C 00000000 */ nop /* 985460 80240630 080901D0 */ j .L80240740 -/* 985464 80240634 00000000 */ nop +/* 985464 80240634 00000000 */ nop .L80240638: /* 985468 80240638 0280282D */ daddu $a1, $s4, $zero /* 98546C 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_9851C4 /* 985484 80240654 0C0125AE */ jal func_800496B8 /* 985488 80240658 02A0302D */ daddu $a2, $s5, $zero /* 98548C 8024065C 080901D0 */ j .L80240740 -/* 985490 80240660 00000000 */ nop +/* 985490 80240660 00000000 */ nop .L80240664: /* 985494 80240664 0260202D */ daddu $a0, $s3, $zero /* 985498 80240668 0280282D */ daddu $a1, $s4, $zero -/* 98549C 8024066C 0C0126D1 */ jal func_80049B44 +/* 98549C 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9854A0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9854A4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9854A8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240394_9851C4 /* 985504 802406D4 0C012701 */ jal func_80049C04 /* 985508 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 98550C 802406DC 080901D0 */ j .L80240740 -/* 985510 802406E0 00000000 */ nop +/* 985510 802406E0 00000000 */ nop .L802406E4: /* 985514 802406E4 0260202D */ daddu $a0, $s3, $zero /* 985518 802406E8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240394_9851C4 /* 98552C 802406FC 0C09001F */ jal func_8024007C_984EAC /* 985530 80240700 02A0302D */ daddu $a2, $s5, $zero /* 985534 80240704 080901D0 */ j .L80240740 -/* 985538 80240708 00000000 */ nop +/* 985538 80240708 00000000 */ nop .L8024070C: /* 98553C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 985540 80240710 0280282D */ daddu $a1, $s4, $zero /* 985544 80240714 0C09006C */ jal func_802401B0_984FE0 /* 985548 80240718 02A0302D */ daddu $a2, $s5, $zero /* 98554C 8024071C 080901D0 */ j .L80240740 -/* 985550 80240720 00000000 */ nop +/* 985550 80240720 00000000 */ nop .L80240724: /* 985554 80240724 0280282D */ daddu $a1, $s4, $zero /* 985558 80240728 0C0900C5 */ jal isk_08_set_script_owner_npc_col_height /* 98555C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 985560 80240730 080901D0 */ j .L80240740 -/* 985564 80240734 00000000 */ nop +/* 985564 80240734 00000000 */ nop .L80240738: /* 985568 80240738 0C0129CF */ jal func_8004A73C /* 98556C 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240394_9851C4 /* 9855C0 80240790 00220821 */ addu $at, $at, $v0 /* 9855C4 80240794 8C221658 */ lw $v0, %lo(D_80241658)($at) /* 9855C8 80240798 00400008 */ jr $v0 -/* 9855CC 8024079C 00000000 */ nop +/* 9855CC 8024079C 00000000 */ nop /* 9855D0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9855D4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9855D8 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index 746bb1d11d..b355e3dbb2 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -55,7 +55,7 @@ glabel func_80240394_998304 /* 9983C8 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 9983CC 8024045C 30420004 */ andi $v0, $v0, 4 /* 9983D0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9983D4 80240464 00000000 */ nop +/* 9983D4 80240464 00000000 */ nop .L80240468: /* 9983D8 80240468 AE600070 */ sw $zero, 0x70($s3) /* 9983DC 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_998304 /* 998480 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 998484 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 998488 80240518 44833000 */ mtc1 $v1, $f6 -/* 99848C 8024051C 00000000 */ nop +/* 99848C 8024051C 00000000 */ nop /* 998490 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 998494 80240524 44073000 */ mfc1 $a3, $f6 /* 998498 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_998304 /* 998550 802405E0 10600015 */ beqz $v1, .L80240638 /* 998554 802405E4 0260202D */ daddu $a0, $s3, $zero /* 998558 802405E8 080901D0 */ j .L80240740 -/* 99855C 802405EC 00000000 */ nop +/* 99855C 802405EC 00000000 */ nop .L802405F0: /* 998560 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 998564 802405F4 24020003 */ addiu $v0, $zero, 3 /* 998568 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 99856C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 998570 80240600 080901D0 */ j .L80240740 -/* 998574 80240604 00000000 */ nop +/* 998574 80240604 00000000 */ nop .L80240608: /* 998578 80240608 2402000E */ addiu $v0, $zero, 0xe /* 99857C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_998304 /* 998590 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 998594 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 998598 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 99859C 8024062C 00000000 */ nop +/* 99859C 8024062C 00000000 */ nop /* 9985A0 80240630 080901D0 */ j .L80240740 -/* 9985A4 80240634 00000000 */ nop +/* 9985A4 80240634 00000000 */ nop .L80240638: /* 9985A8 80240638 0280282D */ daddu $a1, $s4, $zero /* 9985AC 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_998304 /* 9985C4 80240654 0C0125AE */ jal func_800496B8 /* 9985C8 80240658 02A0302D */ daddu $a2, $s5, $zero /* 9985CC 8024065C 080901D0 */ j .L80240740 -/* 9985D0 80240660 00000000 */ nop +/* 9985D0 80240660 00000000 */ nop .L80240664: /* 9985D4 80240664 0260202D */ daddu $a0, $s3, $zero /* 9985D8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9985DC 8024066C 0C0126D1 */ jal func_80049B44 +/* 9985DC 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9985E0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9985E4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9985E8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240394_998304 /* 998644 802406D4 0C012701 */ jal func_80049C04 /* 998648 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 99864C 802406DC 080901D0 */ j .L80240740 -/* 998650 802406E0 00000000 */ nop +/* 998650 802406E0 00000000 */ nop .L802406E4: /* 998654 802406E4 0260202D */ daddu $a0, $s3, $zero /* 998658 802406E8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240394_998304 /* 99866C 802406FC 0C09001F */ jal func_8024007C_997FEC /* 998670 80240700 02A0302D */ daddu $a2, $s5, $zero /* 998674 80240704 080901D0 */ j .L80240740 -/* 998678 80240708 00000000 */ nop +/* 998678 80240708 00000000 */ nop .L8024070C: /* 99867C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 998680 80240710 0280282D */ daddu $a1, $s4, $zero /* 998684 80240714 0C09006C */ jal func_802401B0_998120 /* 998688 80240718 02A0302D */ daddu $a2, $s5, $zero /* 99868C 8024071C 080901D0 */ j .L80240740 -/* 998690 80240720 00000000 */ nop +/* 998690 80240720 00000000 */ nop .L80240724: /* 998694 80240724 0280282D */ daddu $a1, $s4, $zero /* 998698 80240728 0C0900C5 */ jal isk_18_set_script_owner_npc_col_height /* 99869C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9986A0 80240730 080901D0 */ j .L80240740 -/* 9986A4 80240734 00000000 */ nop +/* 9986A4 80240734 00000000 */ nop .L80240738: /* 9986A8 80240738 0C0129CF */ jal func_8004A73C /* 9986AC 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240394_998304 /* 998700 80240790 00220821 */ addu $at, $at, $v0 /* 998704 80240794 8C221778 */ lw $v0, %lo(D_80241778)($at) /* 998708 80240798 00400008 */ jr $v0 -/* 99870C 8024079C 00000000 */ nop +/* 99870C 8024079C 00000000 */ nop /* 998710 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 998714 802407A4 24420001 */ addiu $v0, $v0, 1 /* 998718 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index fa8a9143d3..9f58dafa23 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -46,7 +46,7 @@ glabel func_80241F6C_91161C /* 9116C0 80242010 8E4200B0 */ lw $v0, 0xb0($s2) /* 9116C4 80242014 30420004 */ andi $v0, $v0, 4 /* 9116C8 80242018 1040002F */ beqz $v0, .L802420D8 -/* 9116CC 8024201C 00000000 */ nop +/* 9116CC 8024201C 00000000 */ nop .L80242020: /* 9116D0 80242020 2404F7FF */ addiu $a0, $zero, -0x801 /* 9116D4 80242024 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241F6C_91161C /* 91179C 802420EC 00220821 */ addu $at, $at, $v0 /* 9117A0 802420F0 8C226430 */ lw $v0, %lo(D_80246430)($at) /* 9117A4 802420F4 00400008 */ jr $v0 -/* 9117A8 802420F8 00000000 */ nop +/* 9117A8 802420F8 00000000 */ nop /* 9117AC 802420FC 0260202D */ daddu $a0, $s3, $zero /* 9117B0 80242100 0200282D */ daddu $a1, $s0, $zero /* 9117B4 80242104 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241F6C_91161C /* 9117C4 80242114 0C0125AE */ jal func_800496B8 /* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero /* 9117CC 8024211C 08090899 */ j .L80242264 -/* 9117D0 80242120 00000000 */ nop +/* 9117D0 80242120 00000000 */ nop /* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero /* 9117D8 80242128 0200282D */ daddu $a1, $s0, $zero -/* 9117DC 8024212C 0C0126D1 */ jal func_80049B44 +/* 9117DC 8024212C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9117E0 80242130 02A0302D */ daddu $a2, $s5, $zero /* 9117E4 80242134 0260202D */ daddu $a0, $s3, $zero /* 9117E8 80242138 0200282D */ daddu $a1, $s0, $zero /* 9117EC 8024213C 0C012701 */ jal func_80049C04 /* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero /* 9117F4 80242144 08090899 */ j .L80242264 -/* 9117F8 80242148 00000000 */ nop +/* 9117F8 80242148 00000000 */ nop /* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero /* 911800 80242150 0200282D */ daddu $a1, $s0, $zero /* 911804 80242154 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241F6C_91161C /* 911814 80242164 0C0127B3 */ jal func_80049ECC /* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero /* 91181C 8024216C 08090899 */ j .L80242264 -/* 911820 80242170 00000000 */ nop +/* 911820 80242170 00000000 */ nop /* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911828 80242178 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91182C 8024217C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241F6C_91161C /* 911844 80242194 10400008 */ beqz $v0, .L802421B8 /* 911848 80242198 46000086 */ mov.s $f2, $f0 /* 91184C 8024219C 44820000 */ mtc1 $v0, $f0 -/* 911850 802421A0 00000000 */ nop +/* 911850 802421A0 00000000 */ nop /* 911854 802421A4 46800020 */ cvt.s.w $f0, $f0 /* 911858 802421A8 4602003C */ c.lt.s $f0, $f2 -/* 91185C 802421AC 00000000 */ nop +/* 91185C 802421AC 00000000 */ nop /* 911860 802421B0 4500000B */ bc1f .L802421E0 /* 911864 802421B4 0260202D */ daddu $a0, $s3, $zero .L802421B8: @@ -164,7 +164,7 @@ glabel func_80241F6C_91161C /* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) /* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc /* 911884 802421D4 14620023 */ bne $v1, $v0, .L80242264 -/* 911888 802421D8 00000000 */ nop +/* 911888 802421D8 00000000 */ nop /* 91188C 802421DC 0260202D */ daddu $a0, $s3, $zero .L802421E0: /* 911890 802421E0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241F6C_91161C /* 9118A4 802421F4 0C012849 */ jal func_8004A124 /* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero /* 9118AC 802421FC 08090899 */ j .L80242264 -/* 9118B0 80242200 00000000 */ nop +/* 9118B0 80242200 00000000 */ nop /* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero /* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero /* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 /* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero /* 9118C4 80242214 08090899 */ j .L80242264 -/* 9118C8 80242218 00000000 */ nop +/* 9118C8 80242218 00000000 */ nop /* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero /* 9118D4 80242224 08090899 */ j .L80242264 -/* 9118D8 80242228 00000000 */ nop +/* 9118D8 80242228 00000000 */ nop /* 9118DC 8024222C 0C090255 */ jal iwa_01_UnkSetDurationFunc /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 -/* 9118E8 80242238 00000000 */ nop +/* 9118E8 80242238 00000000 */ nop /* 9118EC 8024223C 0C090266 */ jal iwa_01_UnkNpcAIFunc9 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 -/* 9118F8 80242248 00000000 */ nop +/* 9118F8 80242248 00000000 */ nop /* 9118FC 8024224C 0C09028E */ jal iwa_01_UnkDurationCheck /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 -/* 911908 80242258 00000000 */ nop +/* 911908 80242258 00000000 */ nop /* 91190C 8024225C 0C0129CF */ jal func_8004A73C /* 911910 80242260 0260202D */ daddu $a0, $s3, $zero .L80242264: diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024023C_B34E0C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024023C_B34E0C.s deleted file mode 100644 index 4928a7f2a1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024023C_B34E0C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_B34E0C -/* B34E0C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B34E10 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* B34E14 80240244 0080802D */ daddu $s0, $a0, $zero -/* B34E18 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* B34E1C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B34E20 80240250 8E02000C */ lw $v0, 0xc($s0) -/* B34E24 80240254 0C0B210B */ jal get_float_variable -/* B34E28 80240258 8C450000 */ lw $a1, ($v0) -/* B34E2C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* B34E30 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* B34E34 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* B34E38 80240268 44060000 */ mfc1 $a2, $f0 -/* B34E3C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* B34E40 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* B34E44 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* B34E48 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* B34E4C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* B34E50 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* B34E54 80240284 0C00A7E7 */ jal add_vec2D_polar -/* B34E58 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* B34E5C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* B34E60 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* B34E64 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* B34E68 80240298 0C0B2190 */ jal set_float_variable -/* B34E6C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B34E70 802402A0 0200202D */ daddu $a0, $s0, $zero -/* B34E74 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* B34E78 802402A8 4406A000 */ mfc1 $a2, $f20 -/* B34E7C 802402AC 0C0B2190 */ jal set_float_variable -/* B34E80 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B34E84 802402B4 0200202D */ daddu $a0, $s0, $zero -/* B34E88 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* B34E8C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* B34E90 802402C0 0C0B2190 */ jal set_float_variable -/* B34E94 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B34E98 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* B34E9C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* B34EA0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B34EA4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* B34EA8 802402D8 03E00008 */ jr $ra -/* B34EAC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s index 64b12120cf..8e1e790c7b 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -117,7 +117,7 @@ glabel func_80241EE8_B4C958 /* B4CB00 80242090 00000000 */ nop /* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero /* B4CB08 80242098 0260282D */ daddu $a1, $s3, $zero -/* B4CB0C 8024209C 0C0126D1 */ jal func_80049B44 +/* B4CB0C 8024209C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B4CB10 802420A0 0280302D */ daddu $a2, $s4, $zero /* B4CB14 802420A4 0240202D */ daddu $a0, $s2, $zero /* B4CB18 802420A8 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index c283f83f3f..aba32b93d9 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -117,7 +117,7 @@ glabel func_80241E38_B54668 /* B54810 80241FE0 00000000 */ nop /* B54814 80241FE4 0240202D */ daddu $a0, $s2, $zero /* B54818 80241FE8 0260282D */ daddu $a1, $s3, $zero -/* B5481C 80241FEC 0C0126D1 */ jal func_80049B44 +/* B5481C 80241FEC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B54820 80241FF0 0280302D */ daddu $a2, $s4, $zero /* B54824 80241FF4 0240202D */ daddu $a0, $s2, $zero /* B54828 80241FF8 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index d71388f7ae..9b085c3755 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -117,7 +117,7 @@ glabel func_80240830_B5A0A0 /* B5A248 802409D8 00000000 */ nop /* B5A24C 802409DC 0240202D */ daddu $a0, $s2, $zero /* B5A250 802409E0 0260282D */ daddu $a1, $s3, $zero -/* B5A254 802409E4 0C0126D1 */ jal func_80049B44 +/* B5A254 802409E4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B5A258 802409E8 0280302D */ daddu $a2, $s4, $zero /* B5A25C 802409EC 0240202D */ daddu $a0, $s2, $zero /* B5A260 802409F0 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s index 5ca09b1adb..486798a960 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -117,7 +117,7 @@ glabel func_80241C84_B5FF34 /* B600DC 80241E2C 00000000 */ nop /* B600E0 80241E30 0240202D */ daddu $a0, $s2, $zero /* B600E4 80241E34 0260282D */ daddu $a1, $s3, $zero -/* B600E8 80241E38 0C0126D1 */ jal func_80049B44 +/* B600E8 80241E38 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B600EC 80241E3C 0280302D */ daddu $a2, $s4, $zero /* B600F0 80241E40 0240202D */ daddu $a0, $s2, $zero /* B600F4 80241E44 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_8024023C_B65CEC.s b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_8024023C_B65CEC.s deleted file mode 100644 index cabb58319a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_8024023C_B65CEC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_B65CEC -/* B65CEC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B65CF0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* B65CF4 80240244 0080802D */ daddu $s0, $a0, $zero -/* B65CF8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* B65CFC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B65D00 80240250 8E02000C */ lw $v0, 0xc($s0) -/* B65D04 80240254 0C0B210B */ jal get_float_variable -/* B65D08 80240258 8C450000 */ lw $a1, ($v0) -/* B65D0C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* B65D10 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* B65D14 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* B65D18 80240268 44060000 */ mfc1 $a2, $f0 -/* B65D1C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* B65D20 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* B65D24 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* B65D28 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* B65D2C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* B65D30 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* B65D34 80240284 0C00A7E7 */ jal add_vec2D_polar -/* B65D38 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* B65D3C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* B65D40 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* B65D44 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* B65D48 80240298 0C0B2190 */ jal set_float_variable -/* B65D4C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B65D50 802402A0 0200202D */ daddu $a0, $s0, $zero -/* B65D54 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* B65D58 802402A8 4406A000 */ mfc1 $a2, $f20 -/* B65D5C 802402AC 0C0B2190 */ jal set_float_variable -/* B65D60 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B65D64 802402B4 0200202D */ daddu $a0, $s0, $zero -/* B65D68 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* B65D6C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* B65D70 802402C0 0C0B2190 */ jal set_float_variable -/* B65D74 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B65D78 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* B65D7C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* B65D80 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B65D84 802402D4 24020002 */ addiu $v0, $zero, 2 -/* B65D88 802402D8 03E00008 */ jr $ra -/* B65D8C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index 9740fd5b63..2293d3c68f 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -117,7 +117,7 @@ glabel func_80241170_B66C20 /* B66DC8 80241318 00000000 */ nop /* B66DCC 8024131C 0240202D */ daddu $a0, $s2, $zero /* B66DD0 80241320 0260282D */ daddu $a1, $s3, $zero -/* B66DD4 80241324 0C0126D1 */ jal func_80049B44 +/* B66DD4 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B66DD8 80241328 0280302D */ daddu $a2, $s4, $zero /* B66DDC 8024132C 0240202D */ daddu $a0, $s2, $zero /* B66DE0 80241330 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240394_B70BF4.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240394_B70BF4.s deleted file mode 100644 index 2ea65fc2a0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240394_B70BF4.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_B70BF4 -/* B70BF4 80240394 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B70BF8 80240398 AFB00018 */ sw $s0, 0x18($sp) -/* B70BFC 8024039C 0080802D */ daddu $s0, $a0, $zero -/* B70C00 802403A0 AFBF001C */ sw $ra, 0x1c($sp) -/* B70C04 802403A4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B70C08 802403A8 8E02000C */ lw $v0, 0xc($s0) -/* B70C0C 802403AC 0C0B210B */ jal get_float_variable -/* B70C10 802403B0 8C450000 */ lw $a1, ($v0) -/* B70C14 802403B4 27A40010 */ addiu $a0, $sp, 0x10 -/* B70C18 802403B8 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* B70C1C 802403BC 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* B70C20 802403C0 44060000 */ mfc1 $a2, $f0 -/* B70C24 802403C4 C4400028 */ lwc1 $f0, 0x28($v0) -/* B70C28 802403C8 C4420030 */ lwc1 $f2, 0x30($v0) -/* B70C2C 802403CC E7A00010 */ swc1 $f0, 0x10($sp) -/* B70C30 802403D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* B70C34 802403D4 8C470080 */ lw $a3, 0x80($v0) -/* B70C38 802403D8 C454002C */ lwc1 $f20, 0x2c($v0) -/* B70C3C 802403DC 0C00A7E7 */ jal add_vec2D_polar -/* B70C40 802403E0 27A50014 */ addiu $a1, $sp, 0x14 -/* B70C44 802403E4 0200202D */ daddu $a0, $s0, $zero -/* B70C48 802403E8 3C05FE36 */ lui $a1, 0xfe36 -/* B70C4C 802403EC 8FA60010 */ lw $a2, 0x10($sp) -/* B70C50 802403F0 0C0B2190 */ jal set_float_variable -/* B70C54 802403F4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B70C58 802403F8 0200202D */ daddu $a0, $s0, $zero -/* B70C5C 802403FC 3C05FE36 */ lui $a1, 0xfe36 -/* B70C60 80240400 4406A000 */ mfc1 $a2, $f20 -/* B70C64 80240404 0C0B2190 */ jal set_float_variable -/* B70C68 80240408 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B70C6C 8024040C 0200202D */ daddu $a0, $s0, $zero -/* B70C70 80240410 3C05FE36 */ lui $a1, 0xfe36 -/* B70C74 80240414 8FA60014 */ lw $a2, 0x14($sp) -/* B70C78 80240418 0C0B2190 */ jal set_float_variable -/* B70C7C 8024041C 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B70C80 80240420 8FBF001C */ lw $ra, 0x1c($sp) -/* B70C84 80240424 8FB00018 */ lw $s0, 0x18($sp) -/* B70C88 80240428 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B70C8C 8024042C 24020002 */ addiu $v0, $zero, 2 -/* B70C90 80240430 03E00008 */ jr $ra -/* B70C94 80240434 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index 268d82f094..15e49ffa14 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -117,7 +117,7 @@ glabel func_80240CF0_B73DA0 /* B73F48 80240E98 00000000 */ nop /* B73F4C 80240E9C 0240202D */ daddu $a0, $s2, $zero /* B73F50 80240EA0 0260282D */ daddu $a1, $s3, $zero -/* B73F54 80240EA4 0C0126D1 */ jal func_80049B44 +/* B73F54 80240EA4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B73F58 80240EA8 0280302D */ daddu $a2, $s4, $zero /* B73F5C 80240EAC 0240202D */ daddu $a0, $s2, $zero /* B73F60 80240EB0 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024023C_8B02AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024023C_8B02AC.s deleted file mode 100644 index cf9f22adaf..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024023C_8B02AC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8B02AC -/* 8B02AC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B02B0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 8B02B4 80240244 0080802D */ daddu $s0, $a0, $zero -/* 8B02B8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B02BC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8B02C0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 8B02C4 80240254 0C0B210B */ jal get_float_variable -/* 8B02C8 80240258 8C450000 */ lw $a1, ($v0) -/* 8B02CC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B02D0 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8B02D4 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8B02D8 80240268 44060000 */ mfc1 $a2, $f0 -/* 8B02DC 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 8B02E0 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8B02E4 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B02E8 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8B02EC 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 8B02F0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8B02F4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 8B02F8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 8B02FC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 8B0300 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0304 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 8B0308 80240298 0C0B2190 */ jal set_float_variable -/* 8B030C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B0310 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 8B0314 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0318 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 8B031C 802402AC 0C0B2190 */ jal set_float_variable -/* 8B0320 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8B0324 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 8B0328 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 8B032C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 8B0330 802402C0 0C0B2190 */ jal set_float_variable -/* 8B0334 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8B0338 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B033C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8B0340 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8B0344 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 8B0348 802402D8 03E00008 */ jr $ra -/* 8B034C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C_8EC08C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C_8EC08C.s deleted file mode 100644 index fc7e1d5d6a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C_8EC08C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024026C_8EC08C -/* 8EC08C 8024026C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8EC090 80240270 AFB00018 */ sw $s0, 0x18($sp) -/* 8EC094 80240274 0080802D */ daddu $s0, $a0, $zero -/* 8EC098 80240278 AFBF001C */ sw $ra, 0x1c($sp) -/* 8EC09C 8024027C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8EC0A0 80240280 8E02000C */ lw $v0, 0xc($s0) -/* 8EC0A4 80240284 0C0B210B */ jal get_float_variable -/* 8EC0A8 80240288 8C450000 */ lw $a1, ($v0) -/* 8EC0AC 8024028C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC0B0 80240290 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8EC0B4 80240294 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8EC0B8 80240298 44060000 */ mfc1 $a2, $f0 -/* 8EC0BC 8024029C C4400028 */ lwc1 $f0, 0x28($v0) -/* 8EC0C0 802402A0 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8EC0C4 802402A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8EC0C8 802402A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8EC0CC 802402AC 8C470080 */ lw $a3, 0x80($v0) -/* 8EC0D0 802402B0 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8EC0D4 802402B4 0C00A7E7 */ jal add_vec2D_polar -/* 8EC0D8 802402B8 27A50014 */ addiu $a1, $sp, 0x14 -/* 8EC0DC 802402BC 0200202D */ daddu $a0, $s0, $zero -/* 8EC0E0 802402C0 3C05FE36 */ lui $a1, 0xfe36 -/* 8EC0E4 802402C4 8FA60010 */ lw $a2, 0x10($sp) -/* 8EC0E8 802402C8 0C0B2190 */ jal set_float_variable -/* 8EC0EC 802402CC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EC0F0 802402D0 0200202D */ daddu $a0, $s0, $zero -/* 8EC0F4 802402D4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EC0F8 802402D8 4406A000 */ mfc1 $a2, $f20 -/* 8EC0FC 802402DC 0C0B2190 */ jal set_float_variable -/* 8EC100 802402E0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EC104 802402E4 0200202D */ daddu $a0, $s0, $zero -/* 8EC108 802402E8 3C05FE36 */ lui $a1, 0xfe36 -/* 8EC10C 802402EC 8FA60014 */ lw $a2, 0x14($sp) -/* 8EC110 802402F0 0C0B2190 */ jal set_float_variable -/* 8EC114 802402F4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EC118 802402F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EC11C 802402FC 8FB00018 */ lw $s0, 0x18($sp) -/* 8EC120 80240300 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8EC124 80240304 24020002 */ addiu $v0, $zero, 2 -/* 8EC128 80240308 03E00008 */ jr $ra -/* 8EC12C 8024030C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC_8ED7DC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC_8ED7DC.s deleted file mode 100644 index ff3437a0df..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC_8ED7DC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419BC_8ED7DC -/* 8ED7DC 802419BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8ED7E0 802419C0 AFB00018 */ sw $s0, 0x18($sp) -/* 8ED7E4 802419C4 0080802D */ daddu $s0, $a0, $zero -/* 8ED7E8 802419C8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8ED7EC 802419CC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8ED7F0 802419D0 8E02000C */ lw $v0, 0xc($s0) -/* 8ED7F4 802419D4 0C0B210B */ jal get_float_variable -/* 8ED7F8 802419D8 8C450000 */ lw $a1, ($v0) -/* 8ED7FC 802419DC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED800 802419E0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8ED804 802419E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8ED808 802419E8 44060000 */ mfc1 $a2, $f0 -/* 8ED80C 802419EC C4400028 */ lwc1 $f0, 0x28($v0) -/* 8ED810 802419F0 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8ED814 802419F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8ED818 802419F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8ED81C 802419FC 8C470080 */ lw $a3, 0x80($v0) -/* 8ED820 80241A00 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8ED824 80241A04 0C00A7E7 */ jal add_vec2D_polar -/* 8ED828 80241A08 27A50014 */ addiu $a1, $sp, 0x14 -/* 8ED82C 80241A0C 0200202D */ daddu $a0, $s0, $zero -/* 8ED830 80241A10 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED834 80241A14 8FA60010 */ lw $a2, 0x10($sp) -/* 8ED838 80241A18 0C0B2190 */ jal set_float_variable -/* 8ED83C 80241A1C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8ED840 80241A20 0200202D */ daddu $a0, $s0, $zero -/* 8ED844 80241A24 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED848 80241A28 4406A000 */ mfc1 $a2, $f20 -/* 8ED84C 80241A2C 0C0B2190 */ jal set_float_variable -/* 8ED850 80241A30 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8ED854 80241A34 0200202D */ daddu $a0, $s0, $zero -/* 8ED858 80241A38 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED85C 80241A3C 8FA60014 */ lw $a2, 0x14($sp) -/* 8ED860 80241A40 0C0B2190 */ jal set_float_variable -/* 8ED864 80241A44 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8ED868 80241A48 8FBF001C */ lw $ra, 0x1c($sp) -/* 8ED86C 80241A4C 8FB00018 */ lw $s0, 0x18($sp) -/* 8ED870 80241A50 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8ED874 80241A54 24020002 */ addiu $v0, $zero, 2 -/* 8ED878 80241A58 03E00008 */ jr $ra -/* 8ED87C 80241A5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C_8EDDAC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C_8EDDAC.s deleted file mode 100644 index fe15208e9d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C_8EDDAC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F8C_8EDDAC -/* 8EDDAC 80241F8C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8EDDB0 80241F90 AFB00018 */ sw $s0, 0x18($sp) -/* 8EDDB4 80241F94 0080802D */ daddu $s0, $a0, $zero -/* 8EDDB8 80241F98 AFBF001C */ sw $ra, 0x1c($sp) -/* 8EDDBC 80241F9C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8EDDC0 80241FA0 8E02000C */ lw $v0, 0xc($s0) -/* 8EDDC4 80241FA4 0C0B210B */ jal get_float_variable -/* 8EDDC8 80241FA8 8C450000 */ lw $a1, ($v0) -/* 8EDDCC 80241FAC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EDDD0 80241FB0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8EDDD4 80241FB4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8EDDD8 80241FB8 44060000 */ mfc1 $a2, $f0 -/* 8EDDDC 80241FBC C4400028 */ lwc1 $f0, 0x28($v0) -/* 8EDDE0 80241FC0 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8EDDE4 80241FC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8EDDE8 80241FC8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8EDDEC 80241FCC 8C470080 */ lw $a3, 0x80($v0) -/* 8EDDF0 80241FD0 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8EDDF4 80241FD4 0C00A7E7 */ jal add_vec2D_polar -/* 8EDDF8 80241FD8 27A50014 */ addiu $a1, $sp, 0x14 -/* 8EDDFC 80241FDC 0200202D */ daddu $a0, $s0, $zero -/* 8EDE00 80241FE0 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDE04 80241FE4 8FA60010 */ lw $a2, 0x10($sp) -/* 8EDE08 80241FE8 0C0B2190 */ jal set_float_variable -/* 8EDE0C 80241FEC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EDE10 80241FF0 0200202D */ daddu $a0, $s0, $zero -/* 8EDE14 80241FF4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDE18 80241FF8 4406A000 */ mfc1 $a2, $f20 -/* 8EDE1C 80241FFC 0C0B2190 */ jal set_float_variable -/* 8EDE20 80242000 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EDE24 80242004 0200202D */ daddu $a0, $s0, $zero -/* 8EDE28 80242008 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDE2C 8024200C 8FA60014 */ lw $a2, 0x14($sp) -/* 8EDE30 80242010 0C0B2190 */ jal set_float_variable -/* 8EDE34 80242014 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EDE38 80242018 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EDE3C 8024201C 8FB00018 */ lw $s0, 0x18($sp) -/* 8EDE40 80242020 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8EDE44 80242024 24020002 */ addiu $v0, $zero, 2 -/* 8EDE48 80242028 03E00008 */ jr $ra -/* 8EDE4C 8024202C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s index f38b277b8c..92f2590cc8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -55,7 +55,7 @@ glabel func_802404F4_A47454 /* A47518 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) /* A4751C 802405BC 30420004 */ andi $v0, $v0, 4 /* A47520 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A47524 802405C4 00000000 */ nop +/* A47524 802405C4 00000000 */ nop .L802405C8: /* A47528 802405C8 AE600070 */ sw $zero, 0x70($s3) /* A4752C 802405CC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802404F4_A47454 /* A475D0 80240670 24020028 */ addiu $v0, $zero, 0x28 /* A475D4 80240674 AFA2001C */ sw $v0, 0x1c($sp) /* A475D8 80240678 44833000 */ mtc1 $v1, $f6 -/* A475DC 8024067C 00000000 */ nop +/* A475DC 8024067C 00000000 */ nop /* A475E0 80240680 468031A0 */ cvt.s.w $f6, $f6 /* A475E4 80240684 44073000 */ mfc1 $a3, $f6 /* A475E8 80240688 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802404F4_A47454 /* A476A0 80240740 10600015 */ beqz $v1, .L80240798 /* A476A4 80240744 0260202D */ daddu $a0, $s3, $zero /* A476A8 80240748 08090228 */ j .L802408A0 -/* A476AC 8024074C 00000000 */ nop +/* A476AC 8024074C 00000000 */ nop .L80240750: /* A476B0 80240750 1062001C */ beq $v1, $v0, .L802407C4 /* A476B4 80240754 24020003 */ addiu $v0, $zero, 3 /* A476B8 80240758 10620035 */ beq $v1, $v0, .L80240830 /* A476BC 8024075C 0260202D */ daddu $a0, $s3, $zero /* A476C0 80240760 08090228 */ j .L802408A0 -/* A476C4 80240764 00000000 */ nop +/* A476C4 80240764 00000000 */ nop .L80240768: /* A476C8 80240768 2402000E */ addiu $v0, $zero, 0xe /* A476CC 8024076C 1062003F */ beq $v1, $v0, .L8024086C @@ -177,9 +177,9 @@ glabel func_802404F4_A47454 /* A476E0 80240780 10620040 */ beq $v1, $v0, .L80240884 /* A476E4 80240784 24020063 */ addiu $v0, $zero, 0x63 /* A476E8 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A476EC 8024078C 00000000 */ nop +/* A476EC 8024078C 00000000 */ nop /* A476F0 80240790 08090228 */ j .L802408A0 -/* A476F4 80240794 00000000 */ nop +/* A476F4 80240794 00000000 */ nop .L80240798: /* A476F8 80240798 0280282D */ daddu $a1, $s4, $zero /* A476FC 8024079C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802404F4_A47454 /* A47714 802407B4 0C0125AE */ jal func_800496B8 /* A47718 802407B8 02A0302D */ daddu $a2, $s5, $zero /* A4771C 802407BC 08090228 */ j .L802408A0 -/* A47720 802407C0 00000000 */ nop +/* A47720 802407C0 00000000 */ nop .L802407C4: /* A47724 802407C4 0260202D */ daddu $a0, $s3, $zero /* A47728 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A4772C 802407CC 0C0126D1 */ jal func_80049B44 +/* A4772C 802407CC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A47730 802407D0 02A0302D */ daddu $a2, $s5, $zero /* A47734 802407D4 8E230088 */ lw $v1, 0x88($s1) /* A47738 802407D8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802404F4_A47454 /* A47794 80240834 0C012701 */ jal func_80049C04 /* A47798 80240838 02A0302D */ daddu $a2, $s5, $zero /* A4779C 8024083C 08090228 */ j .L802408A0 -/* A477A0 80240840 00000000 */ nop +/* A477A0 80240840 00000000 */ nop .L80240844: /* A477A4 80240844 0260202D */ daddu $a0, $s3, $zero /* A477A8 80240848 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802404F4_A47454 /* A477BC 8024085C 0C090077 */ jal func_802401DC_A4713C /* A477C0 80240860 02A0302D */ daddu $a2, $s5, $zero /* A477C4 80240864 08090228 */ j .L802408A0 -/* A477C8 80240868 00000000 */ nop +/* A477C8 80240868 00000000 */ nop .L8024086C: /* A477CC 8024086C 0260202D */ daddu $a0, $s3, $zero /* A477D0 80240870 0280282D */ daddu $a1, $s4, $zero /* A477D4 80240874 0C0900C4 */ jal func_80240310_A47270 /* A477D8 80240878 02A0302D */ daddu $a2, $s5, $zero /* A477DC 8024087C 08090228 */ j .L802408A0 -/* A477E0 80240880 00000000 */ nop +/* A477E0 80240880 00000000 */ nop .L80240884: /* A477E4 80240884 0280282D */ daddu $a1, $s4, $zero /* A477E8 80240888 0C09011D */ jal kpa_01_set_script_owner_npc_col_height /* A477EC 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A477F0 80240890 08090228 */ j .L802408A0 -/* A477F4 80240894 00000000 */ nop +/* A477F4 80240894 00000000 */ nop .L80240898: /* A477F8 80240898 0C0129CF */ jal func_8004A73C /* A477FC 8024089C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802404F4_A47454 /* A47850 802408F0 00220821 */ addu $at, $at, $v0 /* A47854 802408F4 8C221608 */ lw $v0, %lo(D_80241608)($at) /* A47858 802408F8 00400008 */ jr $v0 -/* A4785C 802408FC 00000000 */ nop +/* A4785C 802408FC 00000000 */ nop /* A47860 80240900 8E420028 */ lw $v0, 0x28($s2) /* A47864 80240904 24420001 */ addiu $v0, $v0, 1 /* A47868 80240908 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index b43dd051d3..292c684820 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -55,7 +55,7 @@ glabel func_802404F4_A48AB4 /* A48B78 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) /* A48B7C 802405BC 30420004 */ andi $v0, $v0, 4 /* A48B80 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A48B84 802405C4 00000000 */ nop +/* A48B84 802405C4 00000000 */ nop .L802405C8: /* A48B88 802405C8 AE600070 */ sw $zero, 0x70($s3) /* A48B8C 802405CC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802404F4_A48AB4 /* A48C30 80240670 24020028 */ addiu $v0, $zero, 0x28 /* A48C34 80240674 AFA2001C */ sw $v0, 0x1c($sp) /* A48C38 80240678 44833000 */ mtc1 $v1, $f6 -/* A48C3C 8024067C 00000000 */ nop +/* A48C3C 8024067C 00000000 */ nop /* A48C40 80240680 468031A0 */ cvt.s.w $f6, $f6 /* A48C44 80240684 44073000 */ mfc1 $a3, $f6 /* A48C48 80240688 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802404F4_A48AB4 /* A48D00 80240740 10600015 */ beqz $v1, .L80240798 /* A48D04 80240744 0260202D */ daddu $a0, $s3, $zero /* A48D08 80240748 08090228 */ j .L802408A0 -/* A48D0C 8024074C 00000000 */ nop +/* A48D0C 8024074C 00000000 */ nop .L80240750: /* A48D10 80240750 1062001C */ beq $v1, $v0, .L802407C4 /* A48D14 80240754 24020003 */ addiu $v0, $zero, 3 /* A48D18 80240758 10620035 */ beq $v1, $v0, .L80240830 /* A48D1C 8024075C 0260202D */ daddu $a0, $s3, $zero /* A48D20 80240760 08090228 */ j .L802408A0 -/* A48D24 80240764 00000000 */ nop +/* A48D24 80240764 00000000 */ nop .L80240768: /* A48D28 80240768 2402000E */ addiu $v0, $zero, 0xe /* A48D2C 8024076C 1062003F */ beq $v1, $v0, .L8024086C @@ -177,9 +177,9 @@ glabel func_802404F4_A48AB4 /* A48D40 80240780 10620040 */ beq $v1, $v0, .L80240884 /* A48D44 80240784 24020063 */ addiu $v0, $zero, 0x63 /* A48D48 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A48D4C 8024078C 00000000 */ nop +/* A48D4C 8024078C 00000000 */ nop /* A48D50 80240790 08090228 */ j .L802408A0 -/* A48D54 80240794 00000000 */ nop +/* A48D54 80240794 00000000 */ nop .L80240798: /* A48D58 80240798 0280282D */ daddu $a1, $s4, $zero /* A48D5C 8024079C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802404F4_A48AB4 /* A48D74 802407B4 0C0125AE */ jal func_800496B8 /* A48D78 802407B8 02A0302D */ daddu $a2, $s5, $zero /* A48D7C 802407BC 08090228 */ j .L802408A0 -/* A48D80 802407C0 00000000 */ nop +/* A48D80 802407C0 00000000 */ nop .L802407C4: /* A48D84 802407C4 0260202D */ daddu $a0, $s3, $zero /* A48D88 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A48D8C 802407CC 0C0126D1 */ jal func_80049B44 +/* A48D8C 802407CC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A48D90 802407D0 02A0302D */ daddu $a2, $s5, $zero /* A48D94 802407D4 8E230088 */ lw $v1, 0x88($s1) /* A48D98 802407D8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802404F4_A48AB4 /* A48DF4 80240834 0C012701 */ jal func_80049C04 /* A48DF8 80240838 02A0302D */ daddu $a2, $s5, $zero /* A48DFC 8024083C 08090228 */ j .L802408A0 -/* A48E00 80240840 00000000 */ nop +/* A48E00 80240840 00000000 */ nop .L80240844: /* A48E04 80240844 0260202D */ daddu $a0, $s3, $zero /* A48E08 80240848 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802404F4_A48AB4 /* A48E1C 8024085C 0C090077 */ jal func_802401DC_A4879C /* A48E20 80240860 02A0302D */ daddu $a2, $s5, $zero /* A48E24 80240864 08090228 */ j .L802408A0 -/* A48E28 80240868 00000000 */ nop +/* A48E28 80240868 00000000 */ nop .L8024086C: /* A48E2C 8024086C 0260202D */ daddu $a0, $s3, $zero /* A48E30 80240870 0280282D */ daddu $a1, $s4, $zero /* A48E34 80240874 0C0900C4 */ jal func_80240310_A488D0 /* A48E38 80240878 02A0302D */ daddu $a2, $s5, $zero /* A48E3C 8024087C 08090228 */ j .L802408A0 -/* A48E40 80240880 00000000 */ nop +/* A48E40 80240880 00000000 */ nop .L80240884: /* A48E44 80240884 0280282D */ daddu $a1, $s4, $zero /* A48E48 80240888 0C09011D */ jal kpa_03_set_script_owner_npc_col_height /* A48E4C 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A48E50 80240890 08090228 */ j .L802408A0 -/* A48E54 80240894 00000000 */ nop +/* A48E54 80240894 00000000 */ nop .L80240898: /* A48E58 80240898 0C0129CF */ jal func_8004A73C /* A48E5C 8024089C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802404F4_A48AB4 /* A48EB0 802408F0 00220821 */ addu $at, $at, $v0 /* A48EB4 802408F4 8C223888 */ lw $v0, %lo(D_80243888)($at) /* A48EB8 802408F8 00400008 */ jr $v0 -/* A48EBC 802408FC 00000000 */ nop +/* A48EBC 802408FC 00000000 */ nop /* A48EC0 80240900 8E420028 */ lw $v0, 0x28($s2) /* A48EC4 80240904 24420001 */ addiu $v0, $v0, 1 /* A48EC8 80240908 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index 8df0e94877..03774026e1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -46,7 +46,7 @@ glabel func_80240F94_A4FF94 /* A50038 80241038 8E4200B0 */ lw $v0, 0xb0($s2) /* A5003C 8024103C 30420004 */ andi $v0, $v0, 4 /* A50040 80241040 1040002F */ beqz $v0, .L80241100 -/* A50044 80241044 00000000 */ nop +/* A50044 80241044 00000000 */ nop .L80241048: /* A50048 80241048 2404F7FF */ addiu $a0, $zero, -0x801 /* A5004C 8024104C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240F94_A4FF94 /* A50114 80241114 00220821 */ addu $at, $at, $v0 /* A50118 80241118 8C2227E8 */ lw $v0, %lo(D_802427E8)($at) /* A5011C 8024111C 00400008 */ jr $v0 -/* A50120 80241120 00000000 */ nop +/* A50120 80241120 00000000 */ nop /* A50124 80241124 0260202D */ daddu $a0, $s3, $zero /* A50128 80241128 0200282D */ daddu $a1, $s0, $zero /* A5012C 8024112C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240F94_A4FF94 /* A5013C 8024113C 0C0125AE */ jal func_800496B8 /* A50140 80241140 02A0302D */ daddu $a2, $s5, $zero /* A50144 80241144 080904A3 */ j .L8024128C -/* A50148 80241148 00000000 */ nop +/* A50148 80241148 00000000 */ nop /* A5014C 8024114C 0260202D */ daddu $a0, $s3, $zero /* A50150 80241150 0200282D */ daddu $a1, $s0, $zero -/* A50154 80241154 0C0126D1 */ jal func_80049B44 +/* A50154 80241154 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A50158 80241158 02A0302D */ daddu $a2, $s5, $zero /* A5015C 8024115C 0260202D */ daddu $a0, $s3, $zero /* A50160 80241160 0200282D */ daddu $a1, $s0, $zero /* A50164 80241164 0C012701 */ jal func_80049C04 /* A50168 80241168 02A0302D */ daddu $a2, $s5, $zero /* A5016C 8024116C 080904A3 */ j .L8024128C -/* A50170 80241170 00000000 */ nop +/* A50170 80241170 00000000 */ nop /* A50174 80241174 0260202D */ daddu $a0, $s3, $zero /* A50178 80241178 0200282D */ daddu $a1, $s0, $zero /* A5017C 8024117C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240F94_A4FF94 /* A5018C 8024118C 0C0127B3 */ jal func_80049ECC /* A50190 80241190 02A0302D */ daddu $a2, $s5, $zero /* A50194 80241194 080904A3 */ j .L8024128C -/* A50198 80241198 00000000 */ nop +/* A50198 80241198 00000000 */ nop /* A5019C 8024119C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A501A0 802411A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A501A4 802411A4 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240F94_A4FF94 /* A501BC 802411BC 10400008 */ beqz $v0, .L802411E0 /* A501C0 802411C0 46000086 */ mov.s $f2, $f0 /* A501C4 802411C4 44820000 */ mtc1 $v0, $f0 -/* A501C8 802411C8 00000000 */ nop +/* A501C8 802411C8 00000000 */ nop /* A501CC 802411CC 46800020 */ cvt.s.w $f0, $f0 /* A501D0 802411D0 4602003C */ c.lt.s $f0, $f2 -/* A501D4 802411D4 00000000 */ nop +/* A501D4 802411D4 00000000 */ nop /* A501D8 802411D8 4500000B */ bc1f .L80241208 /* A501DC 802411DC 0260202D */ daddu $a0, $s3, $zero .L802411E0: @@ -164,7 +164,7 @@ glabel func_80240F94_A4FF94 /* A501F4 802411F4 8E630070 */ lw $v1, 0x70($s3) /* A501F8 802411F8 2402000C */ addiu $v0, $zero, 0xc /* A501FC 802411FC 14620023 */ bne $v1, $v0, .L8024128C -/* A50200 80241200 00000000 */ nop +/* A50200 80241200 00000000 */ nop /* A50204 80241204 0260202D */ daddu $a0, $s3, $zero .L80241208: /* A50208 80241208 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240F94_A4FF94 /* A5021C 8024121C 0C012849 */ jal func_8004A124 /* A50220 80241220 02A0302D */ daddu $a2, $s5, $zero /* A50224 80241224 080904A3 */ j .L8024128C -/* A50228 80241228 00000000 */ nop +/* A50228 80241228 00000000 */ nop /* A5022C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A50230 80241230 0200282D */ daddu $a1, $s0, $zero /* A50234 80241234 0C0128FA */ jal func_8004A3E8 /* A50238 80241238 02A0302D */ daddu $a2, $s5, $zero /* A5023C 8024123C 080904A3 */ j .L8024128C -/* A50240 80241240 00000000 */ nop +/* A50240 80241240 00000000 */ nop /* A50244 80241244 0C0900F5 */ jal func_802403D4_A4F3D4 /* A50248 80241248 0260202D */ daddu $a0, $s3, $zero /* A5024C 8024124C 080904A3 */ j .L8024128C -/* A50250 80241250 00000000 */ nop +/* A50250 80241250 00000000 */ nop /* A50254 80241254 0C090135 */ jal kpa_09_UnkSetDurationFunc /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero /* A5025C 8024125C 080904A3 */ j .L8024128C -/* A50260 80241260 00000000 */ nop +/* A50260 80241260 00000000 */ nop /* A50264 80241264 0C090146 */ jal kpa_09_UnkNpcAIFunc9 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero /* A5026C 8024126C 080904A3 */ j .L8024128C -/* A50270 80241270 00000000 */ nop +/* A50270 80241270 00000000 */ nop /* A50274 80241274 0C09016E */ jal kpa_09_UnkDurationCheck /* A50278 80241278 0260202D */ daddu $a0, $s3, $zero /* A5027C 8024127C 080904A3 */ j .L8024128C -/* A50280 80241280 00000000 */ nop +/* A50280 80241280 00000000 */ nop /* A50284 80241284 0C0129CF */ jal func_8004A73C /* A50288 80241288 0260202D */ daddu $a0, $s3, $zero .L8024128C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index 95a9f145fa..bc82614b1b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -46,7 +46,7 @@ glabel func_80241204_A94944 /* A949E8 802412A8 8E4200B0 */ lw $v0, 0xb0($s2) /* A949EC 802412AC 30420004 */ andi $v0, $v0, 4 /* A949F0 802412B0 1040002F */ beqz $v0, .L80241370 -/* A949F4 802412B4 00000000 */ nop +/* A949F4 802412B4 00000000 */ nop .L802412B8: /* A949F8 802412B8 2404F7FF */ addiu $a0, $zero, -0x801 /* A949FC 802412BC AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241204_A94944 /* A94AC4 80241384 00220821 */ addu $at, $at, $v0 /* A94AC8 80241388 8C225B48 */ lw $v0, %lo(D_80245B48)($at) /* A94ACC 8024138C 00400008 */ jr $v0 -/* A94AD0 80241390 00000000 */ nop +/* A94AD0 80241390 00000000 */ nop /* A94AD4 80241394 0260202D */ daddu $a0, $s3, $zero /* A94AD8 80241398 0200282D */ daddu $a1, $s0, $zero /* A94ADC 8024139C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241204_A94944 /* A94AEC 802413AC 0C0125AE */ jal func_800496B8 /* A94AF0 802413B0 02A0302D */ daddu $a2, $s5, $zero /* A94AF4 802413B4 0809053F */ j .L802414FC -/* A94AF8 802413B8 00000000 */ nop +/* A94AF8 802413B8 00000000 */ nop /* A94AFC 802413BC 0260202D */ daddu $a0, $s3, $zero /* A94B00 802413C0 0200282D */ daddu $a1, $s0, $zero -/* A94B04 802413C4 0C0126D1 */ jal func_80049B44 +/* A94B04 802413C4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A94B08 802413C8 02A0302D */ daddu $a2, $s5, $zero /* A94B0C 802413CC 0260202D */ daddu $a0, $s3, $zero /* A94B10 802413D0 0200282D */ daddu $a1, $s0, $zero /* A94B14 802413D4 0C012701 */ jal func_80049C04 /* A94B18 802413D8 02A0302D */ daddu $a2, $s5, $zero /* A94B1C 802413DC 0809053F */ j .L802414FC -/* A94B20 802413E0 00000000 */ nop +/* A94B20 802413E0 00000000 */ nop /* A94B24 802413E4 0260202D */ daddu $a0, $s3, $zero /* A94B28 802413E8 0200282D */ daddu $a1, $s0, $zero /* A94B2C 802413EC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241204_A94944 /* A94B3C 802413FC 0C0127B3 */ jal func_80049ECC /* A94B40 80241400 02A0302D */ daddu $a2, $s5, $zero /* A94B44 80241404 0809053F */ j .L802414FC -/* A94B48 80241408 00000000 */ nop +/* A94B48 80241408 00000000 */ nop /* A94B4C 8024140C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A94B50 80241410 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A94B54 80241414 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241204_A94944 /* A94B6C 8024142C 10400008 */ beqz $v0, .L80241450 /* A94B70 80241430 46000086 */ mov.s $f2, $f0 /* A94B74 80241434 44820000 */ mtc1 $v0, $f0 -/* A94B78 80241438 00000000 */ nop +/* A94B78 80241438 00000000 */ nop /* A94B7C 8024143C 46800020 */ cvt.s.w $f0, $f0 /* A94B80 80241440 4602003C */ c.lt.s $f0, $f2 -/* A94B84 80241444 00000000 */ nop +/* A94B84 80241444 00000000 */ nop /* A94B88 80241448 4500000B */ bc1f .L80241478 /* A94B8C 8024144C 0260202D */ daddu $a0, $s3, $zero .L80241450: @@ -164,7 +164,7 @@ glabel func_80241204_A94944 /* A94BA4 80241464 8E630070 */ lw $v1, 0x70($s3) /* A94BA8 80241468 2402000C */ addiu $v0, $zero, 0xc /* A94BAC 8024146C 14620023 */ bne $v1, $v0, .L802414FC -/* A94BB0 80241470 00000000 */ nop +/* A94BB0 80241470 00000000 */ nop /* A94BB4 80241474 0260202D */ daddu $a0, $s3, $zero .L80241478: /* A94BB8 80241478 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241204_A94944 /* A94BCC 8024148C 0C012849 */ jal func_8004A124 /* A94BD0 80241490 02A0302D */ daddu $a2, $s5, $zero /* A94BD4 80241494 0809053F */ j .L802414FC -/* A94BD8 80241498 00000000 */ nop +/* A94BD8 80241498 00000000 */ nop /* A94BDC 8024149C 0260202D */ daddu $a0, $s3, $zero /* A94BE0 802414A0 0200282D */ daddu $a1, $s0, $zero /* A94BE4 802414A4 0C0128FA */ jal func_8004A3E8 /* A94BE8 802414A8 02A0302D */ daddu $a2, $s5, $zero /* A94BEC 802414AC 0809053F */ j .L802414FC -/* A94BF0 802414B0 00000000 */ nop +/* A94BF0 802414B0 00000000 */ nop /* A94BF4 802414B4 0C090191 */ jal func_80240644_A93D84 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero /* A94BFC 802414BC 0809053F */ j .L802414FC -/* A94C00 802414C0 00000000 */ nop +/* A94C00 802414C0 00000000 */ nop /* A94C04 802414C4 0C0901D1 */ jal kpa_102_UnkSetDurationFunc /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC -/* A94C10 802414D0 00000000 */ nop +/* A94C10 802414D0 00000000 */ nop /* A94C14 802414D4 0C0901E2 */ jal kpa_102_UnkNpcAIFunc9 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC -/* A94C20 802414E0 00000000 */ nop +/* A94C20 802414E0 00000000 */ nop /* A94C24 802414E4 0C09020A */ jal kpa_102_UnkDurationCheck /* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero /* A94C2C 802414EC 0809053F */ j .L802414FC -/* A94C30 802414F0 00000000 */ nop +/* A94C30 802414F0 00000000 */ nop /* A94C34 802414F4 0C0129CF */ jal func_8004A73C /* A94C38 802414F8 0260202D */ daddu $a0, $s3, $zero .L802414FC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s index a92efa86d3..0e4ab8fb97 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s @@ -55,7 +55,7 @@ glabel func_802418F0_A95030 /* A950F4 802419B4 8E2200B0 */ lw $v0, 0xb0($s1) /* A950F8 802419B8 30420004 */ andi $v0, $v0, 4 /* A950FC 802419BC 10400047 */ beqz $v0, .L80241ADC -/* A95100 802419C0 00000000 */ nop +/* A95100 802419C0 00000000 */ nop .L802419C4: /* A95104 802419C4 AE600070 */ sw $zero, 0x70($s3) /* A95108 802419C8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802418F0_A95030 /* A951AC 80241A6C 24020028 */ addiu $v0, $zero, 0x28 /* A951B0 80241A70 AFA2001C */ sw $v0, 0x1c($sp) /* A951B4 80241A74 44833000 */ mtc1 $v1, $f6 -/* A951B8 80241A78 00000000 */ nop +/* A951B8 80241A78 00000000 */ nop /* A951BC 80241A7C 468031A0 */ cvt.s.w $f6, $f6 /* A951C0 80241A80 44073000 */ mfc1 $a3, $f6 /* A951C4 80241A84 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802418F0_A95030 /* A9527C 80241B3C 10600015 */ beqz $v1, .L80241B94 /* A95280 80241B40 0260202D */ daddu $a0, $s3, $zero /* A95284 80241B44 08090727 */ j .L80241C9C -/* A95288 80241B48 00000000 */ nop +/* A95288 80241B48 00000000 */ nop .L80241B4C: /* A9528C 80241B4C 1062001C */ beq $v1, $v0, .L80241BC0 /* A95290 80241B50 24020003 */ addiu $v0, $zero, 3 /* A95294 80241B54 10620035 */ beq $v1, $v0, .L80241C2C /* A95298 80241B58 0260202D */ daddu $a0, $s3, $zero /* A9529C 80241B5C 08090727 */ j .L80241C9C -/* A952A0 80241B60 00000000 */ nop +/* A952A0 80241B60 00000000 */ nop .L80241B64: /* A952A4 80241B64 2402000E */ addiu $v0, $zero, 0xe /* A952A8 80241B68 1062003F */ beq $v1, $v0, .L80241C68 @@ -177,9 +177,9 @@ glabel func_802418F0_A95030 /* A952BC 80241B7C 10620040 */ beq $v1, $v0, .L80241C80 /* A952C0 80241B80 24020063 */ addiu $v0, $zero, 0x63 /* A952C4 80241B84 10620043 */ beq $v1, $v0, .L80241C94 -/* A952C8 80241B88 00000000 */ nop +/* A952C8 80241B88 00000000 */ nop /* A952CC 80241B8C 08090727 */ j .L80241C9C -/* A952D0 80241B90 00000000 */ nop +/* A952D0 80241B90 00000000 */ nop .L80241B94: /* A952D4 80241B94 0280282D */ daddu $a1, $s4, $zero /* A952D8 80241B98 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802418F0_A95030 /* A952F0 80241BB0 0C0125AE */ jal func_800496B8 /* A952F4 80241BB4 02A0302D */ daddu $a2, $s5, $zero /* A952F8 80241BB8 08090727 */ j .L80241C9C -/* A952FC 80241BBC 00000000 */ nop +/* A952FC 80241BBC 00000000 */ nop .L80241BC0: /* A95300 80241BC0 0260202D */ daddu $a0, $s3, $zero /* A95304 80241BC4 0280282D */ daddu $a1, $s4, $zero -/* A95308 80241BC8 0C0126D1 */ jal func_80049B44 +/* A95308 80241BC8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9530C 80241BCC 02A0302D */ daddu $a2, $s5, $zero /* A95310 80241BD0 8E230088 */ lw $v1, 0x88($s1) /* A95314 80241BD4 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802418F0_A95030 /* A95370 80241C30 0C012701 */ jal func_80049C04 /* A95374 80241C34 02A0302D */ daddu $a2, $s5, $zero /* A95378 80241C38 08090727 */ j .L80241C9C -/* A9537C 80241C3C 00000000 */ nop +/* A9537C 80241C3C 00000000 */ nop .L80241C40: /* A95380 80241C40 0260202D */ daddu $a0, $s3, $zero /* A95384 80241C44 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802418F0_A95030 /* A95398 80241C58 0C090576 */ jal func_802415D8_A94D18 /* A9539C 80241C5C 02A0302D */ daddu $a2, $s5, $zero /* A953A0 80241C60 08090727 */ j .L80241C9C -/* A953A4 80241C64 00000000 */ nop +/* A953A4 80241C64 00000000 */ nop .L80241C68: /* A953A8 80241C68 0260202D */ daddu $a0, $s3, $zero /* A953AC 80241C6C 0280282D */ daddu $a1, $s4, $zero /* A953B0 80241C70 0C0905C3 */ jal func_8024170C_A94E4C /* A953B4 80241C74 02A0302D */ daddu $a2, $s5, $zero /* A953B8 80241C78 08090727 */ j .L80241C9C -/* A953BC 80241C7C 00000000 */ nop +/* A953BC 80241C7C 00000000 */ nop .L80241C80: /* A953C0 80241C80 0280282D */ daddu $a1, $s4, $zero /* A953C4 80241C84 0C09061C */ jal func_80241870_A94FB0 /* A953C8 80241C88 02A0302D */ daddu $a2, $s5, $zero /* A953CC 80241C8C 08090727 */ j .L80241C9C -/* A953D0 80241C90 00000000 */ nop +/* A953D0 80241C90 00000000 */ nop .L80241C94: /* A953D4 80241C94 0C0129CF */ jal func_8004A73C /* A953D8 80241C98 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802418F0_A95030 /* A9542C 80241CEC 00220821 */ addu $at, $at, $v0 /* A95430 80241CF0 8C225CE0 */ lw $v0, %lo(D_80245CE0)($at) /* A95434 80241CF4 00400008 */ jr $v0 -/* A95438 80241CF8 00000000 */ nop +/* A95438 80241CF8 00000000 */ nop /* A9543C 80241CFC 8E420028 */ lw $v0, 0x28($s2) /* A95440 80241D00 24420001 */ addiu $v0, $v0, 1 /* A95444 80241D04 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s index 82f8e02377..2c9ee70aec 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s @@ -55,7 +55,7 @@ glabel func_802406A4_A52F64 /* A53028 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A5302C 8024076C 30420004 */ andi $v0, $v0, 4 /* A53030 80240770 10400047 */ beqz $v0, .L80240890 -/* A53034 80240774 00000000 */ nop +/* A53034 80240774 00000000 */ nop .L80240778: /* A53038 80240778 AE600070 */ sw $zero, 0x70($s3) /* A5303C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A52F64 /* A530E0 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A530E4 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A530E8 80240828 44833000 */ mtc1 $v1, $f6 -/* A530EC 8024082C 00000000 */ nop +/* A530EC 8024082C 00000000 */ nop /* A530F0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A530F4 80240834 44073000 */ mfc1 $a3, $f6 /* A530F8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A52F64 /* A531B0 802408F0 10600015 */ beqz $v1, .L80240948 /* A531B4 802408F4 0260202D */ daddu $a0, $s3, $zero /* A531B8 802408F8 08090294 */ j .L80240A50 -/* A531BC 802408FC 00000000 */ nop +/* A531BC 802408FC 00000000 */ nop .L80240900: /* A531C0 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A531C4 80240904 24020003 */ addiu $v0, $zero, 3 /* A531C8 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A531CC 8024090C 0260202D */ daddu $a0, $s3, $zero /* A531D0 80240910 08090294 */ j .L80240A50 -/* A531D4 80240914 00000000 */ nop +/* A531D4 80240914 00000000 */ nop .L80240918: /* A531D8 80240918 2402000E */ addiu $v0, $zero, 0xe /* A531DC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A52F64 /* A531F0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A531F4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A531F8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A531FC 8024093C 00000000 */ nop +/* A531FC 8024093C 00000000 */ nop /* A53200 80240940 08090294 */ j .L80240A50 -/* A53204 80240944 00000000 */ nop +/* A53204 80240944 00000000 */ nop .L80240948: /* A53208 80240948 0280282D */ daddu $a1, $s4, $zero /* A5320C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A52F64 /* A53224 80240964 0C0125AE */ jal func_800496B8 /* A53228 80240968 02A0302D */ daddu $a2, $s5, $zero /* A5322C 8024096C 08090294 */ j .L80240A50 -/* A53230 80240970 00000000 */ nop +/* A53230 80240970 00000000 */ nop .L80240974: /* A53234 80240974 0260202D */ daddu $a0, $s3, $zero /* A53238 80240978 0280282D */ daddu $a1, $s4, $zero -/* A5323C 8024097C 0C0126D1 */ jal func_80049B44 +/* A5323C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A53240 80240980 02A0302D */ daddu $a2, $s5, $zero /* A53244 80240984 8E230088 */ lw $v1, 0x88($s1) /* A53248 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_A52F64 /* A532A4 802409E4 0C012701 */ jal func_80049C04 /* A532A8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A532AC 802409EC 08090294 */ j .L80240A50 -/* A532B0 802409F0 00000000 */ nop +/* A532B0 802409F0 00000000 */ nop .L802409F4: /* A532B4 802409F4 0260202D */ daddu $a0, $s3, $zero /* A532B8 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_A52F64 /* A532CC 80240A0C 0C0900E3 */ jal func_8024038C_A52C4C /* A532D0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A532D4 80240A14 08090294 */ j .L80240A50 -/* A532D8 80240A18 00000000 */ nop +/* A532D8 80240A18 00000000 */ nop .L80240A1C: /* A532DC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A532E0 80240A20 0280282D */ daddu $a1, $s4, $zero /* A532E4 80240A24 0C090130 */ jal func_802404C0_A52D80 /* A532E8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A532EC 80240A2C 08090294 */ j .L80240A50 -/* A532F0 80240A30 00000000 */ nop +/* A532F0 80240A30 00000000 */ nop .L80240A34: /* A532F4 80240A34 0280282D */ daddu $a1, $s4, $zero /* A532F8 80240A38 0C090189 */ jal func_80240624_A52EE4 /* A532FC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A53300 80240A40 08090294 */ j .L80240A50 -/* A53304 80240A44 00000000 */ nop +/* A53304 80240A44 00000000 */ nop .L80240A48: /* A53308 80240A48 0C0129CF */ jal func_8004A73C /* A5330C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A52F64 /* A53360 80240AA0 00220821 */ addu $at, $at, $v0 /* A53364 80240AA4 8C222038 */ lw $v0, %lo(D_80242038)($at) /* A53368 80240AA8 00400008 */ jr $v0 -/* A5336C 80240AAC 00000000 */ nop +/* A5336C 80240AAC 00000000 */ nop /* A53370 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A53374 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A53378 80240AB8 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_802406A4_A52F64 /* A53398 80240AD8 8FB00050 */ lw $s0, 0x50($sp) /* A5339C 80240ADC 03E00008 */ jr $ra /* A533A0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A533A4 80240AE4 00000000 */ nop -/* A533A8 80240AE8 00000000 */ nop -/* A533AC 80240AEC 00000000 */ nop +/* A533A4 80240AE4 00000000 */ nop +/* A533A8 80240AE8 00000000 */ nop +/* A533AC 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index 8800427f8d..9dcc178b9f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -46,7 +46,7 @@ glabel func_80241064_A9A5F4 /* A9A698 80241108 8E4200B0 */ lw $v0, 0xb0($s2) /* A9A69C 8024110C 30420004 */ andi $v0, $v0, 4 /* A9A6A0 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9A6A4 80241114 00000000 */ nop +/* A9A6A4 80241114 00000000 */ nop .L80241118: /* A9A6A8 80241118 2404F7FF */ addiu $a0, $zero, -0x801 /* A9A6AC 8024111C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241064_A9A5F4 /* A9A774 802411E4 00220821 */ addu $at, $at, $v0 /* A9A778 802411E8 8C223268 */ lw $v0, %lo(D_80243268)($at) /* A9A77C 802411EC 00400008 */ jr $v0 -/* A9A780 802411F0 00000000 */ nop +/* A9A780 802411F0 00000000 */ nop /* A9A784 802411F4 0260202D */ daddu $a0, $s3, $zero /* A9A788 802411F8 0200282D */ daddu $a1, $s0, $zero /* A9A78C 802411FC 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241064_A9A5F4 /* A9A79C 8024120C 0C0125AE */ jal func_800496B8 /* A9A7A0 80241210 02A0302D */ daddu $a2, $s5, $zero /* A9A7A4 80241214 080904D7 */ j .L8024135C -/* A9A7A8 80241218 00000000 */ nop +/* A9A7A8 80241218 00000000 */ nop /* A9A7AC 8024121C 0260202D */ daddu $a0, $s3, $zero /* A9A7B0 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9A7B4 80241224 0C0126D1 */ jal func_80049B44 +/* A9A7B4 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9A7B8 80241228 02A0302D */ daddu $a2, $s5, $zero /* A9A7BC 8024122C 0260202D */ daddu $a0, $s3, $zero /* A9A7C0 80241230 0200282D */ daddu $a1, $s0, $zero /* A9A7C4 80241234 0C012701 */ jal func_80049C04 /* A9A7C8 80241238 02A0302D */ daddu $a2, $s5, $zero /* A9A7CC 8024123C 080904D7 */ j .L8024135C -/* A9A7D0 80241240 00000000 */ nop +/* A9A7D0 80241240 00000000 */ nop /* A9A7D4 80241244 0260202D */ daddu $a0, $s3, $zero /* A9A7D8 80241248 0200282D */ daddu $a1, $s0, $zero /* A9A7DC 8024124C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241064_A9A5F4 /* A9A7EC 8024125C 0C0127B3 */ jal func_80049ECC /* A9A7F0 80241260 02A0302D */ daddu $a2, $s5, $zero /* A9A7F4 80241264 080904D7 */ j .L8024135C -/* A9A7F8 80241268 00000000 */ nop +/* A9A7F8 80241268 00000000 */ nop /* A9A7FC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A9A800 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A9A804 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241064_A9A5F4 /* A9A81C 8024128C 10400008 */ beqz $v0, .L802412B0 /* A9A820 80241290 46000086 */ mov.s $f2, $f0 /* A9A824 80241294 44820000 */ mtc1 $v0, $f0 -/* A9A828 80241298 00000000 */ nop +/* A9A828 80241298 00000000 */ nop /* A9A82C 8024129C 46800020 */ cvt.s.w $f0, $f0 /* A9A830 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9A834 802412A4 00000000 */ nop +/* A9A834 802412A4 00000000 */ nop /* A9A838 802412A8 4500000B */ bc1f .L802412D8 /* A9A83C 802412AC 0260202D */ daddu $a0, $s3, $zero .L802412B0: @@ -164,7 +164,7 @@ glabel func_80241064_A9A5F4 /* A9A854 802412C4 8E630070 */ lw $v1, 0x70($s3) /* A9A858 802412C8 2402000C */ addiu $v0, $zero, 0xc /* A9A85C 802412CC 14620023 */ bne $v1, $v0, .L8024135C -/* A9A860 802412D0 00000000 */ nop +/* A9A860 802412D0 00000000 */ nop /* A9A864 802412D4 0260202D */ daddu $a0, $s3, $zero .L802412D8: /* A9A868 802412D8 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241064_A9A5F4 /* A9A87C 802412EC 0C012849 */ jal func_8004A124 /* A9A880 802412F0 02A0302D */ daddu $a2, $s5, $zero /* A9A884 802412F4 080904D7 */ j .L8024135C -/* A9A888 802412F8 00000000 */ nop +/* A9A888 802412F8 00000000 */ nop /* A9A88C 802412FC 0260202D */ daddu $a0, $s3, $zero /* A9A890 80241300 0200282D */ daddu $a1, $s0, $zero /* A9A894 80241304 0C0128FA */ jal func_8004A3E8 /* A9A898 80241308 02A0302D */ daddu $a2, $s5, $zero /* A9A89C 8024130C 080904D7 */ j .L8024135C -/* A9A8A0 80241310 00000000 */ nop +/* A9A8A0 80241310 00000000 */ nop /* A9A8A4 80241314 0C090129 */ jal func_802404A4_A99A34 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero /* A9A8AC 8024131C 080904D7 */ j .L8024135C -/* A9A8B0 80241320 00000000 */ nop +/* A9A8B0 80241320 00000000 */ nop /* A9A8B4 80241324 0C090169 */ jal kpa_111_UnkSetDurationFunc /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C -/* A9A8C0 80241330 00000000 */ nop +/* A9A8C0 80241330 00000000 */ nop /* A9A8C4 80241334 0C09017A */ jal kpa_111_UnkNpcAIFunc9 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C -/* A9A8D0 80241340 00000000 */ nop +/* A9A8D0 80241340 00000000 */ nop /* A9A8D4 80241344 0C0901A2 */ jal kpa_111_UnkDurationCheck /* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero /* A9A8DC 8024134C 080904D7 */ j .L8024135C -/* A9A8E0 80241350 00000000 */ nop +/* A9A8E0 80241350 00000000 */ nop /* A9A8E4 80241354 0C0129CF */ jal func_8004A73C /* A9A8E8 80241358 0260202D */ daddu $a0, $s3, $zero .L8024135C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index ee33da04d2..0ff38cec5f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -55,7 +55,7 @@ glabel func_80240544_A9D174 /* A9D238 80240608 8E2200B0 */ lw $v0, 0xb0($s1) /* A9D23C 8024060C 30420004 */ andi $v0, $v0, 4 /* A9D240 80240610 10400047 */ beqz $v0, .L80240730 -/* A9D244 80240614 00000000 */ nop +/* A9D244 80240614 00000000 */ nop .L80240618: /* A9D248 80240618 AE600070 */ sw $zero, 0x70($s3) /* A9D24C 8024061C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240544_A9D174 /* A9D2F0 802406C0 24020028 */ addiu $v0, $zero, 0x28 /* A9D2F4 802406C4 AFA2001C */ sw $v0, 0x1c($sp) /* A9D2F8 802406C8 44833000 */ mtc1 $v1, $f6 -/* A9D2FC 802406CC 00000000 */ nop +/* A9D2FC 802406CC 00000000 */ nop /* A9D300 802406D0 468031A0 */ cvt.s.w $f6, $f6 /* A9D304 802406D4 44073000 */ mfc1 $a3, $f6 /* A9D308 802406D8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240544_A9D174 /* A9D3C0 80240790 10600015 */ beqz $v1, .L802407E8 /* A9D3C4 80240794 0260202D */ daddu $a0, $s3, $zero /* A9D3C8 80240798 0809023C */ j .L802408F0 -/* A9D3CC 8024079C 00000000 */ nop +/* A9D3CC 8024079C 00000000 */ nop .L802407A0: /* A9D3D0 802407A0 1062001C */ beq $v1, $v0, .L80240814 /* A9D3D4 802407A4 24020003 */ addiu $v0, $zero, 3 /* A9D3D8 802407A8 10620035 */ beq $v1, $v0, .L80240880 /* A9D3DC 802407AC 0260202D */ daddu $a0, $s3, $zero /* A9D3E0 802407B0 0809023C */ j .L802408F0 -/* A9D3E4 802407B4 00000000 */ nop +/* A9D3E4 802407B4 00000000 */ nop .L802407B8: /* A9D3E8 802407B8 2402000E */ addiu $v0, $zero, 0xe /* A9D3EC 802407BC 1062003F */ beq $v1, $v0, .L802408BC @@ -177,9 +177,9 @@ glabel func_80240544_A9D174 /* A9D400 802407D0 10620040 */ beq $v1, $v0, .L802408D4 /* A9D404 802407D4 24020063 */ addiu $v0, $zero, 0x63 /* A9D408 802407D8 10620043 */ beq $v1, $v0, .L802408E8 -/* A9D40C 802407DC 00000000 */ nop +/* A9D40C 802407DC 00000000 */ nop /* A9D410 802407E0 0809023C */ j .L802408F0 -/* A9D414 802407E4 00000000 */ nop +/* A9D414 802407E4 00000000 */ nop .L802407E8: /* A9D418 802407E8 0280282D */ daddu $a1, $s4, $zero /* A9D41C 802407EC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240544_A9D174 /* A9D434 80240804 0C0125AE */ jal func_800496B8 /* A9D438 80240808 02A0302D */ daddu $a2, $s5, $zero /* A9D43C 8024080C 0809023C */ j .L802408F0 -/* A9D440 80240810 00000000 */ nop +/* A9D440 80240810 00000000 */ nop .L80240814: /* A9D444 80240814 0260202D */ daddu $a0, $s3, $zero /* A9D448 80240818 0280282D */ daddu $a1, $s4, $zero -/* A9D44C 8024081C 0C0126D1 */ jal func_80049B44 +/* A9D44C 8024081C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9D450 80240820 02A0302D */ daddu $a2, $s5, $zero /* A9D454 80240824 8E230088 */ lw $v1, 0x88($s1) /* A9D458 80240828 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240544_A9D174 /* A9D4B4 80240884 0C012701 */ jal func_80049C04 /* A9D4B8 80240888 02A0302D */ daddu $a2, $s5, $zero /* A9D4BC 8024088C 0809023C */ j .L802408F0 -/* A9D4C0 80240890 00000000 */ nop +/* A9D4C0 80240890 00000000 */ nop .L80240894: /* A9D4C4 80240894 0260202D */ daddu $a0, $s3, $zero /* A9D4C8 80240898 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240544_A9D174 /* A9D4DC 802408AC 0C09008B */ jal func_8024022C_A9CE5C /* A9D4E0 802408B0 02A0302D */ daddu $a2, $s5, $zero /* A9D4E4 802408B4 0809023C */ j .L802408F0 -/* A9D4E8 802408B8 00000000 */ nop +/* A9D4E8 802408B8 00000000 */ nop .L802408BC: /* A9D4EC 802408BC 0260202D */ daddu $a0, $s3, $zero /* A9D4F0 802408C0 0280282D */ daddu $a1, $s4, $zero /* A9D4F4 802408C4 0C0900D8 */ jal func_80240360_A9CF90 /* A9D4F8 802408C8 02A0302D */ daddu $a2, $s5, $zero /* A9D4FC 802408CC 0809023C */ j .L802408F0 -/* A9D500 802408D0 00000000 */ nop +/* A9D500 802408D0 00000000 */ nop .L802408D4: /* A9D504 802408D4 0280282D */ daddu $a1, $s4, $zero /* A9D508 802408D8 0C090131 */ jal kpa_113_set_script_owner_npc_col_height /* A9D50C 802408DC 02A0302D */ daddu $a2, $s5, $zero /* A9D510 802408E0 0809023C */ j .L802408F0 -/* A9D514 802408E4 00000000 */ nop +/* A9D514 802408E4 00000000 */ nop .L802408E8: /* A9D518 802408E8 0C0129CF */ jal func_8004A73C /* A9D51C 802408EC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240544_A9D174 /* A9D570 80240940 00220821 */ addu $at, $at, $v0 /* A9D574 80240944 8C221CF8 */ lw $v0, %lo(D_80241CF8)($at) /* A9D578 80240948 00400008 */ jr $v0 -/* A9D57C 8024094C 00000000 */ nop +/* A9D57C 8024094C 00000000 */ nop /* A9D580 80240950 8E420028 */ lw $v0, 0x28($s2) /* A9D584 80240954 24420001 */ addiu $v0, $v0, 1 /* A9D588 80240958 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index c9be17b93f..7863bc3697 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -46,7 +46,7 @@ glabel func_80241064_A9FDA4 /* A9FE48 80241108 8E4200B0 */ lw $v0, 0xb0($s2) /* A9FE4C 8024110C 30420004 */ andi $v0, $v0, 4 /* A9FE50 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9FE54 80241114 00000000 */ nop +/* A9FE54 80241114 00000000 */ nop .L80241118: /* A9FE58 80241118 2404F7FF */ addiu $a0, $zero, -0x801 /* A9FE5C 8024111C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241064_A9FDA4 /* A9FF24 802411E4 00220821 */ addu $at, $at, $v0 /* A9FF28 802411E8 8C223008 */ lw $v0, %lo(D_80243008)($at) /* A9FF2C 802411EC 00400008 */ jr $v0 -/* A9FF30 802411F0 00000000 */ nop +/* A9FF30 802411F0 00000000 */ nop /* A9FF34 802411F4 0260202D */ daddu $a0, $s3, $zero /* A9FF38 802411F8 0200282D */ daddu $a1, $s0, $zero /* A9FF3C 802411FC 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241064_A9FDA4 /* A9FF4C 8024120C 0C0125AE */ jal func_800496B8 /* A9FF50 80241210 02A0302D */ daddu $a2, $s5, $zero /* A9FF54 80241214 080904D7 */ j .L8024135C -/* A9FF58 80241218 00000000 */ nop +/* A9FF58 80241218 00000000 */ nop /* A9FF5C 8024121C 0260202D */ daddu $a0, $s3, $zero /* A9FF60 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9FF64 80241224 0C0126D1 */ jal func_80049B44 +/* A9FF64 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9FF68 80241228 02A0302D */ daddu $a2, $s5, $zero /* A9FF6C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A9FF70 80241230 0200282D */ daddu $a1, $s0, $zero /* A9FF74 80241234 0C012701 */ jal func_80049C04 /* A9FF78 80241238 02A0302D */ daddu $a2, $s5, $zero /* A9FF7C 8024123C 080904D7 */ j .L8024135C -/* A9FF80 80241240 00000000 */ nop +/* A9FF80 80241240 00000000 */ nop /* A9FF84 80241244 0260202D */ daddu $a0, $s3, $zero /* A9FF88 80241248 0200282D */ daddu $a1, $s0, $zero /* A9FF8C 8024124C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241064_A9FDA4 /* A9FF9C 8024125C 0C0127B3 */ jal func_80049ECC /* A9FFA0 80241260 02A0302D */ daddu $a2, $s5, $zero /* A9FFA4 80241264 080904D7 */ j .L8024135C -/* A9FFA8 80241268 00000000 */ nop +/* A9FFA8 80241268 00000000 */ nop /* A9FFAC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A9FFB0 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A9FFB4 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241064_A9FDA4 /* A9FFCC 8024128C 10400008 */ beqz $v0, .L802412B0 /* A9FFD0 80241290 46000086 */ mov.s $f2, $f0 /* A9FFD4 80241294 44820000 */ mtc1 $v0, $f0 -/* A9FFD8 80241298 00000000 */ nop +/* A9FFD8 80241298 00000000 */ nop /* A9FFDC 8024129C 46800020 */ cvt.s.w $f0, $f0 /* A9FFE0 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9FFE4 802412A4 00000000 */ nop +/* A9FFE4 802412A4 00000000 */ nop /* A9FFE8 802412A8 4500000B */ bc1f .L802412D8 /* A9FFEC 802412AC 0260202D */ daddu $a0, $s3, $zero .L802412B0: @@ -164,7 +164,7 @@ glabel func_80241064_A9FDA4 /* AA0004 802412C4 8E630070 */ lw $v1, 0x70($s3) /* AA0008 802412C8 2402000C */ addiu $v0, $zero, 0xc /* AA000C 802412CC 14620023 */ bne $v1, $v0, .L8024135C -/* AA0010 802412D0 00000000 */ nop +/* AA0010 802412D0 00000000 */ nop /* AA0014 802412D4 0260202D */ daddu $a0, $s3, $zero .L802412D8: /* AA0018 802412D8 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241064_A9FDA4 /* AA002C 802412EC 0C012849 */ jal func_8004A124 /* AA0030 802412F0 02A0302D */ daddu $a2, $s5, $zero /* AA0034 802412F4 080904D7 */ j .L8024135C -/* AA0038 802412F8 00000000 */ nop +/* AA0038 802412F8 00000000 */ nop /* AA003C 802412FC 0260202D */ daddu $a0, $s3, $zero /* AA0040 80241300 0200282D */ daddu $a1, $s0, $zero /* AA0044 80241304 0C0128FA */ jal func_8004A3E8 /* AA0048 80241308 02A0302D */ daddu $a2, $s5, $zero /* AA004C 8024130C 080904D7 */ j .L8024135C -/* AA0050 80241310 00000000 */ nop +/* AA0050 80241310 00000000 */ nop /* AA0054 80241314 0C090129 */ jal func_802404A4_A9F1E4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero /* AA005C 8024131C 080904D7 */ j .L8024135C -/* AA0060 80241320 00000000 */ nop +/* AA0060 80241320 00000000 */ nop /* AA0064 80241324 0C090169 */ jal kpa_115_UnkSetDurationFunc /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C -/* AA0070 80241330 00000000 */ nop +/* AA0070 80241330 00000000 */ nop /* AA0074 80241334 0C09017A */ jal kpa_115_UnkNpcAIFunc9 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C -/* AA0080 80241340 00000000 */ nop +/* AA0080 80241340 00000000 */ nop /* AA0084 80241344 0C0901A2 */ jal kpa_115_UnkDurationCheck /* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero /* AA008C 8024134C 080904D7 */ j .L8024135C -/* AA0090 80241350 00000000 */ nop +/* AA0090 80241350 00000000 */ nop /* AA0094 80241354 0C0129CF */ jal func_8004A73C /* AA0098 80241358 0260202D */ daddu $a0, $s3, $zero .L8024135C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index 19c75c1783..1fdb6c0389 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -46,7 +46,7 @@ glabel func_80240EF4_A618C4 /* A61968 80240F98 8E4200B0 */ lw $v0, 0xb0($s2) /* A6196C 80240F9C 30420004 */ andi $v0, $v0, 4 /* A61970 80240FA0 1040002F */ beqz $v0, .L80241060 -/* A61974 80240FA4 00000000 */ nop +/* A61974 80240FA4 00000000 */ nop .L80240FA8: /* A61978 80240FA8 2404F7FF */ addiu $a0, $zero, -0x801 /* A6197C 80240FAC AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240EF4_A618C4 /* A61A44 80241074 00220821 */ addu $at, $at, $v0 /* A61A48 80241078 8C2234C8 */ lw $v0, %lo(D_802434C8)($at) /* A61A4C 8024107C 00400008 */ jr $v0 -/* A61A50 80241080 00000000 */ nop +/* A61A50 80241080 00000000 */ nop /* A61A54 80241084 0260202D */ daddu $a0, $s3, $zero /* A61A58 80241088 0200282D */ daddu $a1, $s0, $zero /* A61A5C 8024108C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240EF4_A618C4 /* A61A6C 8024109C 0C0125AE */ jal func_800496B8 /* A61A70 802410A0 02A0302D */ daddu $a2, $s5, $zero /* A61A74 802410A4 0809047B */ j .L802411EC -/* A61A78 802410A8 00000000 */ nop +/* A61A78 802410A8 00000000 */ nop /* A61A7C 802410AC 0260202D */ daddu $a0, $s3, $zero /* A61A80 802410B0 0200282D */ daddu $a1, $s0, $zero -/* A61A84 802410B4 0C0126D1 */ jal func_80049B44 +/* A61A84 802410B4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A61A88 802410B8 02A0302D */ daddu $a2, $s5, $zero /* A61A8C 802410BC 0260202D */ daddu $a0, $s3, $zero /* A61A90 802410C0 0200282D */ daddu $a1, $s0, $zero /* A61A94 802410C4 0C012701 */ jal func_80049C04 /* A61A98 802410C8 02A0302D */ daddu $a2, $s5, $zero /* A61A9C 802410CC 0809047B */ j .L802411EC -/* A61AA0 802410D0 00000000 */ nop +/* A61AA0 802410D0 00000000 */ nop /* A61AA4 802410D4 0260202D */ daddu $a0, $s3, $zero /* A61AA8 802410D8 0200282D */ daddu $a1, $s0, $zero /* A61AAC 802410DC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240EF4_A618C4 /* A61ABC 802410EC 0C0127B3 */ jal func_80049ECC /* A61AC0 802410F0 02A0302D */ daddu $a2, $s5, $zero /* A61AC4 802410F4 0809047B */ j .L802411EC -/* A61AC8 802410F8 00000000 */ nop +/* A61AC8 802410F8 00000000 */ nop /* A61ACC 802410FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A61AD0 80241100 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A61AD4 80241104 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240EF4_A618C4 /* A61AEC 8024111C 10400008 */ beqz $v0, .L80241140 /* A61AF0 80241120 46000086 */ mov.s $f2, $f0 /* A61AF4 80241124 44820000 */ mtc1 $v0, $f0 -/* A61AF8 80241128 00000000 */ nop +/* A61AF8 80241128 00000000 */ nop /* A61AFC 8024112C 46800020 */ cvt.s.w $f0, $f0 /* A61B00 80241130 4602003C */ c.lt.s $f0, $f2 -/* A61B04 80241134 00000000 */ nop +/* A61B04 80241134 00000000 */ nop /* A61B08 80241138 4500000B */ bc1f .L80241168 /* A61B0C 8024113C 0260202D */ daddu $a0, $s3, $zero .L80241140: @@ -164,7 +164,7 @@ glabel func_80240EF4_A618C4 /* A61B24 80241154 8E630070 */ lw $v1, 0x70($s3) /* A61B28 80241158 2402000C */ addiu $v0, $zero, 0xc /* A61B2C 8024115C 14620023 */ bne $v1, $v0, .L802411EC -/* A61B30 80241160 00000000 */ nop +/* A61B30 80241160 00000000 */ nop /* A61B34 80241164 0260202D */ daddu $a0, $s3, $zero .L80241168: /* A61B38 80241168 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240EF4_A618C4 /* A61B4C 8024117C 0C012849 */ jal func_8004A124 /* A61B50 80241180 02A0302D */ daddu $a2, $s5, $zero /* A61B54 80241184 0809047B */ j .L802411EC -/* A61B58 80241188 00000000 */ nop +/* A61B58 80241188 00000000 */ nop /* A61B5C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A61B60 80241190 0200282D */ daddu $a1, $s0, $zero /* A61B64 80241194 0C0128FA */ jal func_8004A3E8 /* A61B68 80241198 02A0302D */ daddu $a2, $s5, $zero /* A61B6C 8024119C 0809047B */ j .L802411EC -/* A61B70 802411A0 00000000 */ nop +/* A61B70 802411A0 00000000 */ nop /* A61B74 802411A4 0C0900CD */ jal func_80240334_A60D04 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero /* A61B7C 802411AC 0809047B */ j .L802411EC -/* A61B80 802411B0 00000000 */ nop +/* A61B80 802411B0 00000000 */ nop /* A61B84 802411B4 0C09010D */ jal kpa_50_UnkSetDurationFunc /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC -/* A61B90 802411C0 00000000 */ nop +/* A61B90 802411C0 00000000 */ nop /* A61B94 802411C4 0C09011E */ jal kpa_50_UnkNpcAIFunc9 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC -/* A61BA0 802411D0 00000000 */ nop +/* A61BA0 802411D0 00000000 */ nop /* A61BA4 802411D4 0C090146 */ jal kpa_50_UnkDurationCheck /* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero /* A61BAC 802411DC 0809047B */ j .L802411EC -/* A61BB0 802411E0 00000000 */ nop +/* A61BB0 802411E0 00000000 */ nop /* A61BB4 802411E4 0C0129CF */ jal func_8004A73C /* A61BB8 802411E8 0260202D */ daddu $a0, $s3, $zero .L802411EC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s index 5d51c1003d..1ba9e2f086 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s @@ -55,7 +55,7 @@ glabel func_802415E0_A61FB0 /* A62074 802416A4 8E2200B0 */ lw $v0, 0xb0($s1) /* A62078 802416A8 30420004 */ andi $v0, $v0, 4 /* A6207C 802416AC 10400047 */ beqz $v0, .L802417CC -/* A62080 802416B0 00000000 */ nop +/* A62080 802416B0 00000000 */ nop .L802416B4: /* A62084 802416B4 AE600070 */ sw $zero, 0x70($s3) /* A62088 802416B8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802415E0_A61FB0 /* A6212C 8024175C 24020028 */ addiu $v0, $zero, 0x28 /* A62130 80241760 AFA2001C */ sw $v0, 0x1c($sp) /* A62134 80241764 44833000 */ mtc1 $v1, $f6 -/* A62138 80241768 00000000 */ nop +/* A62138 80241768 00000000 */ nop /* A6213C 8024176C 468031A0 */ cvt.s.w $f6, $f6 /* A62140 80241770 44073000 */ mfc1 $a3, $f6 /* A62144 80241774 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802415E0_A61FB0 /* A621FC 8024182C 10600015 */ beqz $v1, .L80241884 /* A62200 80241830 0260202D */ daddu $a0, $s3, $zero /* A62204 80241834 08090663 */ j .L8024198C -/* A62208 80241838 00000000 */ nop +/* A62208 80241838 00000000 */ nop .L8024183C: /* A6220C 8024183C 1062001C */ beq $v1, $v0, .L802418B0 /* A62210 80241840 24020003 */ addiu $v0, $zero, 3 /* A62214 80241844 10620035 */ beq $v1, $v0, .L8024191C /* A62218 80241848 0260202D */ daddu $a0, $s3, $zero /* A6221C 8024184C 08090663 */ j .L8024198C -/* A62220 80241850 00000000 */ nop +/* A62220 80241850 00000000 */ nop .L80241854: /* A62224 80241854 2402000E */ addiu $v0, $zero, 0xe /* A62228 80241858 1062003F */ beq $v1, $v0, .L80241958 @@ -177,9 +177,9 @@ glabel func_802415E0_A61FB0 /* A6223C 8024186C 10620040 */ beq $v1, $v0, .L80241970 /* A62240 80241870 24020063 */ addiu $v0, $zero, 0x63 /* A62244 80241874 10620043 */ beq $v1, $v0, .L80241984 -/* A62248 80241878 00000000 */ nop +/* A62248 80241878 00000000 */ nop /* A6224C 8024187C 08090663 */ j .L8024198C -/* A62250 80241880 00000000 */ nop +/* A62250 80241880 00000000 */ nop .L80241884: /* A62254 80241884 0280282D */ daddu $a1, $s4, $zero /* A62258 80241888 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802415E0_A61FB0 /* A62270 802418A0 0C0125AE */ jal func_800496B8 /* A62274 802418A4 02A0302D */ daddu $a2, $s5, $zero /* A62278 802418A8 08090663 */ j .L8024198C -/* A6227C 802418AC 00000000 */ nop +/* A6227C 802418AC 00000000 */ nop .L802418B0: /* A62280 802418B0 0260202D */ daddu $a0, $s3, $zero /* A62284 802418B4 0280282D */ daddu $a1, $s4, $zero -/* A62288 802418B8 0C0126D1 */ jal func_80049B44 +/* A62288 802418B8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A6228C 802418BC 02A0302D */ daddu $a2, $s5, $zero /* A62290 802418C0 8E230088 */ lw $v1, 0x88($s1) /* A62294 802418C4 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802415E0_A61FB0 /* A622F0 80241920 0C012701 */ jal func_80049C04 /* A622F4 80241924 02A0302D */ daddu $a2, $s5, $zero /* A622F8 80241928 08090663 */ j .L8024198C -/* A622FC 8024192C 00000000 */ nop +/* A622FC 8024192C 00000000 */ nop .L80241930: /* A62300 80241930 0260202D */ daddu $a0, $s3, $zero /* A62304 80241934 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802415E0_A61FB0 /* A62318 80241948 0C0904B2 */ jal func_802412C8_A61C98 /* A6231C 8024194C 02A0302D */ daddu $a2, $s5, $zero /* A62320 80241950 08090663 */ j .L8024198C -/* A62324 80241954 00000000 */ nop +/* A62324 80241954 00000000 */ nop .L80241958: /* A62328 80241958 0260202D */ daddu $a0, $s3, $zero /* A6232C 8024195C 0280282D */ daddu $a1, $s4, $zero /* A62330 80241960 0C0904FF */ jal func_802413FC_A61DCC /* A62334 80241964 02A0302D */ daddu $a2, $s5, $zero /* A62338 80241968 08090663 */ j .L8024198C -/* A6233C 8024196C 00000000 */ nop +/* A6233C 8024196C 00000000 */ nop .L80241970: /* A62340 80241970 0280282D */ daddu $a1, $s4, $zero /* A62344 80241974 0C090558 */ jal func_80241560_A61F30 /* A62348 80241978 02A0302D */ daddu $a2, $s5, $zero /* A6234C 8024197C 08090663 */ j .L8024198C -/* A62350 80241980 00000000 */ nop +/* A62350 80241980 00000000 */ nop .L80241984: /* A62354 80241984 0C0129CF */ jal func_8004A73C /* A62358 80241988 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802415E0_A61FB0 /* A623AC 802419DC 00220821 */ addu $at, $at, $v0 /* A623B0 802419E0 8C223660 */ lw $v0, %lo(D_80243660)($at) /* A623B4 802419E4 00400008 */ jr $v0 -/* A623B8 802419E8 00000000 */ nop +/* A623B8 802419E8 00000000 */ nop /* A623BC 802419EC 8E420028 */ lw $v0, 0x28($s2) /* A623C0 802419F0 24420001 */ addiu $v0, $v0, 1 /* A623C4 802419F4 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s index 5091193de4..3b711f0323 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s @@ -55,7 +55,7 @@ glabel func_802417E0_A65870 /* A65934 802418A4 8E2200B0 */ lw $v0, 0xb0($s1) /* A65938 802418A8 30420004 */ andi $v0, $v0, 4 /* A6593C 802418AC 10400047 */ beqz $v0, .L802419CC -/* A65940 802418B0 00000000 */ nop +/* A65940 802418B0 00000000 */ nop .L802418B4: /* A65944 802418B4 AE600070 */ sw $zero, 0x70($s3) /* A65948 802418B8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802417E0_A65870 /* A659EC 8024195C 24020028 */ addiu $v0, $zero, 0x28 /* A659F0 80241960 AFA2001C */ sw $v0, 0x1c($sp) /* A659F4 80241964 44833000 */ mtc1 $v1, $f6 -/* A659F8 80241968 00000000 */ nop +/* A659F8 80241968 00000000 */ nop /* A659FC 8024196C 468031A0 */ cvt.s.w $f6, $f6 /* A65A00 80241970 44073000 */ mfc1 $a3, $f6 /* A65A04 80241974 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802417E0_A65870 /* A65ABC 80241A2C 10600015 */ beqz $v1, .L80241A84 /* A65AC0 80241A30 0260202D */ daddu $a0, $s3, $zero /* A65AC4 80241A34 080906E3 */ j .L80241B8C -/* A65AC8 80241A38 00000000 */ nop +/* A65AC8 80241A38 00000000 */ nop .L80241A3C: /* A65ACC 80241A3C 1062001C */ beq $v1, $v0, .L80241AB0 /* A65AD0 80241A40 24020003 */ addiu $v0, $zero, 3 /* A65AD4 80241A44 10620035 */ beq $v1, $v0, .L80241B1C /* A65AD8 80241A48 0260202D */ daddu $a0, $s3, $zero /* A65ADC 80241A4C 080906E3 */ j .L80241B8C -/* A65AE0 80241A50 00000000 */ nop +/* A65AE0 80241A50 00000000 */ nop .L80241A54: /* A65AE4 80241A54 2402000E */ addiu $v0, $zero, 0xe /* A65AE8 80241A58 1062003F */ beq $v1, $v0, .L80241B58 @@ -177,9 +177,9 @@ glabel func_802417E0_A65870 /* A65AFC 80241A6C 10620040 */ beq $v1, $v0, .L80241B70 /* A65B00 80241A70 24020063 */ addiu $v0, $zero, 0x63 /* A65B04 80241A74 10620043 */ beq $v1, $v0, .L80241B84 -/* A65B08 80241A78 00000000 */ nop +/* A65B08 80241A78 00000000 */ nop /* A65B0C 80241A7C 080906E3 */ j .L80241B8C -/* A65B10 80241A80 00000000 */ nop +/* A65B10 80241A80 00000000 */ nop .L80241A84: /* A65B14 80241A84 0280282D */ daddu $a1, $s4, $zero /* A65B18 80241A88 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802417E0_A65870 /* A65B30 80241AA0 0C0125AE */ jal func_800496B8 /* A65B34 80241AA4 02A0302D */ daddu $a2, $s5, $zero /* A65B38 80241AA8 080906E3 */ j .L80241B8C -/* A65B3C 80241AAC 00000000 */ nop +/* A65B3C 80241AAC 00000000 */ nop .L80241AB0: /* A65B40 80241AB0 0260202D */ daddu $a0, $s3, $zero /* A65B44 80241AB4 0280282D */ daddu $a1, $s4, $zero -/* A65B48 80241AB8 0C0126D1 */ jal func_80049B44 +/* A65B48 80241AB8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A65B4C 80241ABC 02A0302D */ daddu $a2, $s5, $zero /* A65B50 80241AC0 8E230088 */ lw $v1, 0x88($s1) /* A65B54 80241AC4 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802417E0_A65870 /* A65BB0 80241B20 0C012701 */ jal func_80049C04 /* A65BB4 80241B24 02A0302D */ daddu $a2, $s5, $zero /* A65BB8 80241B28 080906E3 */ j .L80241B8C -/* A65BBC 80241B2C 00000000 */ nop +/* A65BBC 80241B2C 00000000 */ nop .L80241B30: /* A65BC0 80241B30 0260202D */ daddu $a0, $s3, $zero /* A65BC4 80241B34 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802417E0_A65870 /* A65BD8 80241B48 0C090532 */ jal func_802414C8_A65558 /* A65BDC 80241B4C 02A0302D */ daddu $a2, $s5, $zero /* A65BE0 80241B50 080906E3 */ j .L80241B8C -/* A65BE4 80241B54 00000000 */ nop +/* A65BE4 80241B54 00000000 */ nop .L80241B58: /* A65BE8 80241B58 0260202D */ daddu $a0, $s3, $zero /* A65BEC 80241B5C 0280282D */ daddu $a1, $s4, $zero /* A65BF0 80241B60 0C09057F */ jal func_802415FC_A6568C /* A65BF4 80241B64 02A0302D */ daddu $a2, $s5, $zero /* A65BF8 80241B68 080906E3 */ j .L80241B8C -/* A65BFC 80241B6C 00000000 */ nop +/* A65BFC 80241B6C 00000000 */ nop .L80241B70: /* A65C00 80241B70 0280282D */ daddu $a1, $s4, $zero /* A65C04 80241B74 0C0905D8 */ jal func_80241760_A657F0 /* A65C08 80241B78 02A0302D */ daddu $a2, $s5, $zero /* A65C0C 80241B7C 080906E3 */ j .L80241B8C -/* A65C10 80241B80 00000000 */ nop +/* A65C10 80241B80 00000000 */ nop .L80241B84: /* A65C14 80241B84 0C0129CF */ jal func_8004A73C /* A65C18 80241B88 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802417E0_A65870 /* A65C6C 80241BDC 00220821 */ addu $at, $at, $v0 /* A65C70 80241BE0 8C223010 */ lw $v0, %lo(D_80243010)($at) /* A65C74 80241BE4 00400008 */ jr $v0 -/* A65C78 80241BE8 00000000 */ nop +/* A65C78 80241BE8 00000000 */ nop /* A65C7C 80241BEC 8E420028 */ lw $v0, 0x28($s2) /* A65C80 80241BF0 24420001 */ addiu $v0, $v0, 1 /* A65C84 80241BF4 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index afb6ef66eb..5349ae3aba 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -46,7 +46,7 @@ glabel func_80240FD4_A680D4 /* A68178 80241078 8E4200B0 */ lw $v0, 0xb0($s2) /* A6817C 8024107C 30420004 */ andi $v0, $v0, 4 /* A68180 80241080 1040002F */ beqz $v0, .L80241140 -/* A68184 80241084 00000000 */ nop +/* A68184 80241084 00000000 */ nop .L80241088: /* A68188 80241088 2404F7FF */ addiu $a0, $zero, -0x801 /* A6818C 8024108C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240FD4_A680D4 /* A68254 80241154 00220821 */ addu $at, $at, $v0 /* A68258 80241158 8C223A08 */ lw $v0, %lo(D_80243A08)($at) /* A6825C 8024115C 00400008 */ jr $v0 -/* A68260 80241160 00000000 */ nop +/* A68260 80241160 00000000 */ nop /* A68264 80241164 0260202D */ daddu $a0, $s3, $zero /* A68268 80241168 0200282D */ daddu $a1, $s0, $zero /* A6826C 8024116C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240FD4_A680D4 /* A6827C 8024117C 0C0125AE */ jal func_800496B8 /* A68280 80241180 02A0302D */ daddu $a2, $s5, $zero /* A68284 80241184 080904B3 */ j .L802412CC -/* A68288 80241188 00000000 */ nop +/* A68288 80241188 00000000 */ nop /* A6828C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A68290 80241190 0200282D */ daddu $a1, $s0, $zero -/* A68294 80241194 0C0126D1 */ jal func_80049B44 +/* A68294 80241194 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A68298 80241198 02A0302D */ daddu $a2, $s5, $zero /* A6829C 8024119C 0260202D */ daddu $a0, $s3, $zero /* A682A0 802411A0 0200282D */ daddu $a1, $s0, $zero /* A682A4 802411A4 0C012701 */ jal func_80049C04 /* A682A8 802411A8 02A0302D */ daddu $a2, $s5, $zero /* A682AC 802411AC 080904B3 */ j .L802412CC -/* A682B0 802411B0 00000000 */ nop +/* A682B0 802411B0 00000000 */ nop /* A682B4 802411B4 0260202D */ daddu $a0, $s3, $zero /* A682B8 802411B8 0200282D */ daddu $a1, $s0, $zero /* A682BC 802411BC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240FD4_A680D4 /* A682CC 802411CC 0C0127B3 */ jal func_80049ECC /* A682D0 802411D0 02A0302D */ daddu $a2, $s5, $zero /* A682D4 802411D4 080904B3 */ j .L802412CC -/* A682D8 802411D8 00000000 */ nop +/* A682D8 802411D8 00000000 */ nop /* A682DC 802411DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A682E0 802411E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A682E4 802411E4 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240FD4_A680D4 /* A682FC 802411FC 10400008 */ beqz $v0, .L80241220 /* A68300 80241200 46000086 */ mov.s $f2, $f0 /* A68304 80241204 44820000 */ mtc1 $v0, $f0 -/* A68308 80241208 00000000 */ nop +/* A68308 80241208 00000000 */ nop /* A6830C 8024120C 46800020 */ cvt.s.w $f0, $f0 /* A68310 80241210 4602003C */ c.lt.s $f0, $f2 -/* A68314 80241214 00000000 */ nop +/* A68314 80241214 00000000 */ nop /* A68318 80241218 4500000B */ bc1f .L80241248 /* A6831C 8024121C 0260202D */ daddu $a0, $s3, $zero .L80241220: @@ -164,7 +164,7 @@ glabel func_80240FD4_A680D4 /* A68334 80241234 8E630070 */ lw $v1, 0x70($s3) /* A68338 80241238 2402000C */ addiu $v0, $zero, 0xc /* A6833C 8024123C 14620023 */ bne $v1, $v0, .L802412CC -/* A68340 80241240 00000000 */ nop +/* A68340 80241240 00000000 */ nop /* A68344 80241244 0260202D */ daddu $a0, $s3, $zero .L80241248: /* A68348 80241248 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240FD4_A680D4 /* A6835C 8024125C 0C012849 */ jal func_8004A124 /* A68360 80241260 02A0302D */ daddu $a2, $s5, $zero /* A68364 80241264 080904B3 */ j .L802412CC -/* A68368 80241268 00000000 */ nop +/* A68368 80241268 00000000 */ nop /* A6836C 8024126C 0260202D */ daddu $a0, $s3, $zero /* A68370 80241270 0200282D */ daddu $a1, $s0, $zero /* A68374 80241274 0C0128FA */ jal func_8004A3E8 /* A68378 80241278 02A0302D */ daddu $a2, $s5, $zero /* A6837C 8024127C 080904B3 */ j .L802412CC -/* A68380 80241280 00000000 */ nop +/* A68380 80241280 00000000 */ nop /* A68384 80241284 0C090105 */ jal func_80240414_A67514 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC -/* A68390 80241290 00000000 */ nop +/* A68390 80241290 00000000 */ nop /* A68394 80241294 0C090145 */ jal kpa_52_UnkSetDurationFunc /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC -/* A683A0 802412A0 00000000 */ nop +/* A683A0 802412A0 00000000 */ nop /* A683A4 802412A4 0C090156 */ jal kpa_52_UnkNpcAIFunc9 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC -/* A683B0 802412B0 00000000 */ nop +/* A683B0 802412B0 00000000 */ nop /* A683B4 802412B4 0C09017E */ jal kpa_52_UnkDurationCheck /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero /* A683BC 802412BC 080904B3 */ j .L802412CC -/* A683C0 802412C0 00000000 */ nop +/* A683C0 802412C0 00000000 */ nop /* A683C4 802412C4 0C0129CF */ jal func_8004A73C /* A683C8 802412C8 0260202D */ daddu $a0, $s3, $zero .L802412CC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s index 30cc1edae7..40ecdf9d7e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s @@ -55,7 +55,7 @@ glabel func_802406A4_A6EA84 /* A6EB48 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A6EB4C 8024076C 30420004 */ andi $v0, $v0, 4 /* A6EB50 80240770 10400047 */ beqz $v0, .L80240890 -/* A6EB54 80240774 00000000 */ nop +/* A6EB54 80240774 00000000 */ nop .L80240778: /* A6EB58 80240778 AE600070 */ sw $zero, 0x70($s3) /* A6EB5C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A6EA84 /* A6EC00 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A6EC04 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A6EC08 80240828 44833000 */ mtc1 $v1, $f6 -/* A6EC0C 8024082C 00000000 */ nop +/* A6EC0C 8024082C 00000000 */ nop /* A6EC10 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A6EC14 80240834 44073000 */ mfc1 $a3, $f6 /* A6EC18 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A6EA84 /* A6ECD0 802408F0 10600015 */ beqz $v1, .L80240948 /* A6ECD4 802408F4 0260202D */ daddu $a0, $s3, $zero /* A6ECD8 802408F8 08090294 */ j .L80240A50 -/* A6ECDC 802408FC 00000000 */ nop +/* A6ECDC 802408FC 00000000 */ nop .L80240900: /* A6ECE0 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A6ECE4 80240904 24020003 */ addiu $v0, $zero, 3 /* A6ECE8 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A6ECEC 8024090C 0260202D */ daddu $a0, $s3, $zero /* A6ECF0 80240910 08090294 */ j .L80240A50 -/* A6ECF4 80240914 00000000 */ nop +/* A6ECF4 80240914 00000000 */ nop .L80240918: /* A6ECF8 80240918 2402000E */ addiu $v0, $zero, 0xe /* A6ECFC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A6EA84 /* A6ED10 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A6ED14 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A6ED18 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A6ED1C 8024093C 00000000 */ nop +/* A6ED1C 8024093C 00000000 */ nop /* A6ED20 80240940 08090294 */ j .L80240A50 -/* A6ED24 80240944 00000000 */ nop +/* A6ED24 80240944 00000000 */ nop .L80240948: /* A6ED28 80240948 0280282D */ daddu $a1, $s4, $zero /* A6ED2C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A6EA84 /* A6ED44 80240964 0C0125AE */ jal func_800496B8 /* A6ED48 80240968 02A0302D */ daddu $a2, $s5, $zero /* A6ED4C 8024096C 08090294 */ j .L80240A50 -/* A6ED50 80240970 00000000 */ nop +/* A6ED50 80240970 00000000 */ nop .L80240974: /* A6ED54 80240974 0260202D */ daddu $a0, $s3, $zero /* A6ED58 80240978 0280282D */ daddu $a1, $s4, $zero -/* A6ED5C 8024097C 0C0126D1 */ jal func_80049B44 +/* A6ED5C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A6ED60 80240980 02A0302D */ daddu $a2, $s5, $zero /* A6ED64 80240984 8E230088 */ lw $v1, 0x88($s1) /* A6ED68 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_A6EA84 /* A6EDC4 802409E4 0C012701 */ jal func_80049C04 /* A6EDC8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A6EDCC 802409EC 08090294 */ j .L80240A50 -/* A6EDD0 802409F0 00000000 */ nop +/* A6EDD0 802409F0 00000000 */ nop .L802409F4: /* A6EDD4 802409F4 0260202D */ daddu $a0, $s3, $zero /* A6EDD8 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_A6EA84 /* A6EDEC 80240A0C 0C0900E3 */ jal func_8024038C_A6E76C /* A6EDF0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A6EDF4 80240A14 08090294 */ j .L80240A50 -/* A6EDF8 80240A18 00000000 */ nop +/* A6EDF8 80240A18 00000000 */ nop .L80240A1C: /* A6EDFC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A6EE00 80240A20 0280282D */ daddu $a1, $s4, $zero /* A6EE04 80240A24 0C090130 */ jal func_802404C0_A6E8A0 /* A6EE08 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A6EE0C 80240A2C 08090294 */ j .L80240A50 -/* A6EE10 80240A30 00000000 */ nop +/* A6EE10 80240A30 00000000 */ nop .L80240A34: /* A6EE14 80240A34 0280282D */ daddu $a1, $s4, $zero /* A6EE18 80240A38 0C090189 */ jal func_80240624_A6EA04 /* A6EE1C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A6EE20 80240A40 08090294 */ j .L80240A50 -/* A6EE24 80240A44 00000000 */ nop +/* A6EE24 80240A44 00000000 */ nop .L80240A48: /* A6EE28 80240A48 0C0129CF */ jal func_8004A73C /* A6EE2C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A6EA84 /* A6EE80 80240AA0 00220821 */ addu $at, $at, $v0 /* A6EE84 80240AA4 8C223CD8 */ lw $v0, %lo(D_80243CD8)($at) /* A6EE88 80240AA8 00400008 */ jr $v0 -/* A6EE8C 80240AAC 00000000 */ nop +/* A6EE8C 80240AAC 00000000 */ nop /* A6EE90 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A6EE94 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A6EE98 80240AB8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s index 4d69ceb281..9d4c80c8b8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s @@ -55,7 +55,7 @@ glabel func_802406A4_A74F14 /* A74FD8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A74FDC 8024076C 30420004 */ andi $v0, $v0, 4 /* A74FE0 80240770 10400047 */ beqz $v0, .L80240890 -/* A74FE4 80240774 00000000 */ nop +/* A74FE4 80240774 00000000 */ nop .L80240778: /* A74FE8 80240778 AE600070 */ sw $zero, 0x70($s3) /* A74FEC 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A74F14 /* A75090 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A75094 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A75098 80240828 44833000 */ mtc1 $v1, $f6 -/* A7509C 8024082C 00000000 */ nop +/* A7509C 8024082C 00000000 */ nop /* A750A0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A750A4 80240834 44073000 */ mfc1 $a3, $f6 /* A750A8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A74F14 /* A75160 802408F0 10600015 */ beqz $v1, .L80240948 /* A75164 802408F4 0260202D */ daddu $a0, $s3, $zero /* A75168 802408F8 08090294 */ j .L80240A50 -/* A7516C 802408FC 00000000 */ nop +/* A7516C 802408FC 00000000 */ nop .L80240900: /* A75170 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A75174 80240904 24020003 */ addiu $v0, $zero, 3 /* A75178 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A7517C 8024090C 0260202D */ daddu $a0, $s3, $zero /* A75180 80240910 08090294 */ j .L80240A50 -/* A75184 80240914 00000000 */ nop +/* A75184 80240914 00000000 */ nop .L80240918: /* A75188 80240918 2402000E */ addiu $v0, $zero, 0xe /* A7518C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A74F14 /* A751A0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A751A4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A751A8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A751AC 8024093C 00000000 */ nop +/* A751AC 8024093C 00000000 */ nop /* A751B0 80240940 08090294 */ j .L80240A50 -/* A751B4 80240944 00000000 */ nop +/* A751B4 80240944 00000000 */ nop .L80240948: /* A751B8 80240948 0280282D */ daddu $a1, $s4, $zero /* A751BC 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A74F14 /* A751D4 80240964 0C0125AE */ jal func_800496B8 /* A751D8 80240968 02A0302D */ daddu $a2, $s5, $zero /* A751DC 8024096C 08090294 */ j .L80240A50 -/* A751E0 80240970 00000000 */ nop +/* A751E0 80240970 00000000 */ nop .L80240974: /* A751E4 80240974 0260202D */ daddu $a0, $s3, $zero /* A751E8 80240978 0280282D */ daddu $a1, $s4, $zero -/* A751EC 8024097C 0C0126D1 */ jal func_80049B44 +/* A751EC 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A751F0 80240980 02A0302D */ daddu $a2, $s5, $zero /* A751F4 80240984 8E230088 */ lw $v1, 0x88($s1) /* A751F8 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_A74F14 /* A75254 802409E4 0C012701 */ jal func_80049C04 /* A75258 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A7525C 802409EC 08090294 */ j .L80240A50 -/* A75260 802409F0 00000000 */ nop +/* A75260 802409F0 00000000 */ nop .L802409F4: /* A75264 802409F4 0260202D */ daddu $a0, $s3, $zero /* A75268 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_A74F14 /* A7527C 80240A0C 0C0900E3 */ jal func_8024038C_A74BFC /* A75280 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A75284 80240A14 08090294 */ j .L80240A50 -/* A75288 80240A18 00000000 */ nop +/* A75288 80240A18 00000000 */ nop .L80240A1C: /* A7528C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A75290 80240A20 0280282D */ daddu $a1, $s4, $zero /* A75294 80240A24 0C090130 */ jal func_802404C0_A74D30 /* A75298 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A7529C 80240A2C 08090294 */ j .L80240A50 -/* A752A0 80240A30 00000000 */ nop +/* A752A0 80240A30 00000000 */ nop .L80240A34: /* A752A4 80240A34 0280282D */ daddu $a1, $s4, $zero /* A752A8 80240A38 0C090189 */ jal func_80240624_A74E94 /* A752AC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A752B0 80240A40 08090294 */ j .L80240A50 -/* A752B4 80240A44 00000000 */ nop +/* A752B4 80240A44 00000000 */ nop .L80240A48: /* A752B8 80240A48 0C0129CF */ jal func_8004A73C /* A752BC 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A74F14 /* A75310 80240AA0 00220821 */ addu $at, $at, $v0 /* A75314 80240AA4 8C223BF8 */ lw $v0, %lo(D_80243BF8)($at) /* A75318 80240AA8 00400008 */ jr $v0 -/* A7531C 80240AAC 00000000 */ nop +/* A7531C 80240AAC 00000000 */ nop /* A75320 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A75324 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A75328 80240AB8 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_802406A4_A74F14 /* A75348 80240AD8 8FB00050 */ lw $s0, 0x50($sp) /* A7534C 80240ADC 03E00008 */ jr $ra /* A75350 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A75354 80240AE4 00000000 */ nop -/* A75358 80240AE8 00000000 */ nop -/* A7535C 80240AEC 00000000 */ nop +/* A75354 80240AE4 00000000 */ nop +/* A75358 80240AE8 00000000 */ nop +/* A7535C 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index 525791d142..20258b4e0d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -55,7 +55,7 @@ glabel func_802406A4_C613B4 /* C61478 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* C6147C 8024076C 30420004 */ andi $v0, $v0, 4 /* C61480 80240770 10400047 */ beqz $v0, .L80240890 -/* C61484 80240774 00000000 */ nop +/* C61484 80240774 00000000 */ nop .L80240778: /* C61488 80240778 AE600070 */ sw $zero, 0x70($s3) /* C6148C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_C613B4 /* C61530 80240820 24020028 */ addiu $v0, $zero, 0x28 /* C61534 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* C61538 80240828 44833000 */ mtc1 $v1, $f6 -/* C6153C 8024082C 00000000 */ nop +/* C6153C 8024082C 00000000 */ nop /* C61540 80240830 468031A0 */ cvt.s.w $f6, $f6 /* C61544 80240834 44073000 */ mfc1 $a3, $f6 /* C61548 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_C613B4 /* C61600 802408F0 10600015 */ beqz $v1, .L80240948 /* C61604 802408F4 0260202D */ daddu $a0, $s3, $zero /* C61608 802408F8 08090294 */ j .L80240A50 -/* C6160C 802408FC 00000000 */ nop +/* C6160C 802408FC 00000000 */ nop .L80240900: /* C61610 80240900 1062001C */ beq $v1, $v0, .L80240974 /* C61614 80240904 24020003 */ addiu $v0, $zero, 3 /* C61618 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* C6161C 8024090C 0260202D */ daddu $a0, $s3, $zero /* C61620 80240910 08090294 */ j .L80240A50 -/* C61624 80240914 00000000 */ nop +/* C61624 80240914 00000000 */ nop .L80240918: /* C61628 80240918 2402000E */ addiu $v0, $zero, 0xe /* C6162C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_C613B4 /* C61640 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* C61644 80240934 24020063 */ addiu $v0, $zero, 0x63 /* C61648 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* C6164C 8024093C 00000000 */ nop +/* C6164C 8024093C 00000000 */ nop /* C61650 80240940 08090294 */ j .L80240A50 -/* C61654 80240944 00000000 */ nop +/* C61654 80240944 00000000 */ nop .L80240948: /* C61658 80240948 0280282D */ daddu $a1, $s4, $zero /* C6165C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_C613B4 /* C61674 80240964 0C0125AE */ jal func_800496B8 /* C61678 80240968 02A0302D */ daddu $a2, $s5, $zero /* C6167C 8024096C 08090294 */ j .L80240A50 -/* C61680 80240970 00000000 */ nop +/* C61680 80240970 00000000 */ nop .L80240974: /* C61684 80240974 0260202D */ daddu $a0, $s3, $zero /* C61688 80240978 0280282D */ daddu $a1, $s4, $zero -/* C6168C 8024097C 0C0126D1 */ jal func_80049B44 +/* C6168C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C61690 80240980 02A0302D */ daddu $a2, $s5, $zero /* C61694 80240984 8E230088 */ lw $v1, 0x88($s1) /* C61698 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_C613B4 /* C616F4 802409E4 0C012701 */ jal func_80049C04 /* C616F8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* C616FC 802409EC 08090294 */ j .L80240A50 -/* C61700 802409F0 00000000 */ nop +/* C61700 802409F0 00000000 */ nop .L802409F4: /* C61704 802409F4 0260202D */ daddu $a0, $s3, $zero /* C61708 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_C613B4 /* C6171C 80240A0C 0C0900E3 */ jal func_8024038C_C6109C /* C61720 80240A10 02A0302D */ daddu $a2, $s5, $zero /* C61724 80240A14 08090294 */ j .L80240A50 -/* C61728 80240A18 00000000 */ nop +/* C61728 80240A18 00000000 */ nop .L80240A1C: /* C6172C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* C61730 80240A20 0280282D */ daddu $a1, $s4, $zero /* C61734 80240A24 0C090130 */ jal func_802404C0_C611D0 /* C61738 80240A28 02A0302D */ daddu $a2, $s5, $zero /* C6173C 80240A2C 08090294 */ j .L80240A50 -/* C61740 80240A30 00000000 */ nop +/* C61740 80240A30 00000000 */ nop .L80240A34: /* C61744 80240A34 0280282D */ daddu $a1, $s4, $zero /* C61748 80240A38 0C090189 */ jal kzn_03_set_script_owner_npc_col_height /* C6174C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* C61750 80240A40 08090294 */ j .L80240A50 -/* C61754 80240A44 00000000 */ nop +/* C61754 80240A44 00000000 */ nop .L80240A48: /* C61758 80240A48 0C0129CF */ jal func_8004A73C /* C6175C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_C613B4 /* C617B0 80240AA0 00220821 */ addu $at, $at, $v0 /* C617B4 80240AA4 8C2271E8 */ lw $v0, %lo(D_802471E8)($at) /* C617B8 80240AA8 00400008 */ jr $v0 -/* C617BC 80240AAC 00000000 */ nop +/* C617BC 80240AAC 00000000 */ nop /* C617C0 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* C617C4 80240AB4 24420001 */ addiu $v0, $v0, 1 /* C617C8 80240AB8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s index 720e9edcb0..5adcf8f414 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -117,7 +117,7 @@ glabel func_80241214_C61F24 /* C620CC 802413BC 00000000 */ nop /* C620D0 802413C0 0240202D */ daddu $a0, $s2, $zero /* C620D4 802413C4 0260282D */ daddu $a1, $s3, $zero -/* C620D8 802413C8 0C0126D1 */ jal func_80049B44 +/* C620D8 802413C8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C620DC 802413CC 0280302D */ daddu $a2, $s4, $zero /* C620E0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C620E4 802413D4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s index 6e87f926ae..e93ff16833 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -117,7 +117,7 @@ glabel func_80242B58_C73FD8 /* C74180 80242D00 00000000 */ nop /* C74184 80242D04 0240202D */ daddu $a0, $s2, $zero /* C74188 80242D08 0260282D */ daddu $a1, $s3, $zero -/* C7418C 80242D0C 0C0126D1 */ jal func_80049B44 +/* C7418C 80242D0C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C74190 80242D10 0280302D */ daddu $a2, $s4, $zero /* C74194 80242D14 0240202D */ daddu $a0, $s2, $zero /* C74198 80242D18 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s index 89a78754d6..546079b9c8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -117,7 +117,7 @@ glabel func_8024163C_C7831C /* C784C4 802417E4 00000000 */ nop /* C784C8 802417E8 0240202D */ daddu $a0, $s2, $zero /* C784CC 802417EC 0260282D */ daddu $a1, $s3, $zero -/* C784D0 802417F0 0C0126D1 */ jal func_80049B44 +/* C784D0 802417F0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C784D4 802417F4 0280302D */ daddu $a2, $s4, $zero /* C784D8 802417F8 0240202D */ daddu $a0, $s2, $zero /* C784DC 802417FC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s index d1cfe7971f..b437d272ff 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -55,7 +55,7 @@ glabel func_80242D58_C79A38 /* C79AFC 80242E1C 8E2200B0 */ lw $v0, 0xb0($s1) /* C79B00 80242E20 30420004 */ andi $v0, $v0, 4 /* C79B04 80242E24 10400047 */ beqz $v0, .L80242F44 -/* C79B08 80242E28 00000000 */ nop +/* C79B08 80242E28 00000000 */ nop .L80242E2C: /* C79B0C 80242E2C AE600070 */ sw $zero, 0x70($s3) /* C79B10 80242E30 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80242D58_C79A38 /* C79BB4 80242ED4 24020028 */ addiu $v0, $zero, 0x28 /* C79BB8 80242ED8 AFA2001C */ sw $v0, 0x1c($sp) /* C79BBC 80242EDC 44833000 */ mtc1 $v1, $f6 -/* C79BC0 80242EE0 00000000 */ nop +/* C79BC0 80242EE0 00000000 */ nop /* C79BC4 80242EE4 468031A0 */ cvt.s.w $f6, $f6 /* C79BC8 80242EE8 44073000 */ mfc1 $a3, $f6 /* C79BCC 80242EEC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80242D58_C79A38 /* C79C84 80242FA4 10600015 */ beqz $v1, .L80242FFC /* C79C88 80242FA8 0260202D */ daddu $a0, $s3, $zero /* C79C8C 80242FAC 08090C41 */ j .L80243104 -/* C79C90 80242FB0 00000000 */ nop +/* C79C90 80242FB0 00000000 */ nop .L80242FB4: /* C79C94 80242FB4 1062001C */ beq $v1, $v0, .L80243028 /* C79C98 80242FB8 24020003 */ addiu $v0, $zero, 3 /* C79C9C 80242FBC 10620035 */ beq $v1, $v0, .L80243094 /* C79CA0 80242FC0 0260202D */ daddu $a0, $s3, $zero /* C79CA4 80242FC4 08090C41 */ j .L80243104 -/* C79CA8 80242FC8 00000000 */ nop +/* C79CA8 80242FC8 00000000 */ nop .L80242FCC: /* C79CAC 80242FCC 2402000E */ addiu $v0, $zero, 0xe /* C79CB0 80242FD0 1062003F */ beq $v1, $v0, .L802430D0 @@ -177,9 +177,9 @@ glabel func_80242D58_C79A38 /* C79CC4 80242FE4 10620040 */ beq $v1, $v0, .L802430E8 /* C79CC8 80242FE8 24020063 */ addiu $v0, $zero, 0x63 /* C79CCC 80242FEC 10620043 */ beq $v1, $v0, .L802430FC -/* C79CD0 80242FF0 00000000 */ nop +/* C79CD0 80242FF0 00000000 */ nop /* C79CD4 80242FF4 08090C41 */ j .L80243104 -/* C79CD8 80242FF8 00000000 */ nop +/* C79CD8 80242FF8 00000000 */ nop .L80242FFC: /* C79CDC 80242FFC 0280282D */ daddu $a1, $s4, $zero /* C79CE0 80243000 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80242D58_C79A38 /* C79CF8 80243018 0C0125AE */ jal func_800496B8 /* C79CFC 8024301C 02A0302D */ daddu $a2, $s5, $zero /* C79D00 80243020 08090C41 */ j .L80243104 -/* C79D04 80243024 00000000 */ nop +/* C79D04 80243024 00000000 */ nop .L80243028: /* C79D08 80243028 0260202D */ daddu $a0, $s3, $zero /* C79D0C 8024302C 0280282D */ daddu $a1, $s4, $zero -/* C79D10 80243030 0C0126D1 */ jal func_80049B44 +/* C79D10 80243030 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C79D14 80243034 02A0302D */ daddu $a2, $s5, $zero /* C79D18 80243038 8E230088 */ lw $v1, 0x88($s1) /* C79D1C 8024303C 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80242D58_C79A38 /* C79D78 80243098 0C012701 */ jal func_80049C04 /* C79D7C 8024309C 02A0302D */ daddu $a2, $s5, $zero /* C79D80 802430A0 08090C41 */ j .L80243104 -/* C79D84 802430A4 00000000 */ nop +/* C79D84 802430A4 00000000 */ nop .L802430A8: /* C79D88 802430A8 0260202D */ daddu $a0, $s3, $zero /* C79D8C 802430AC 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80242D58_C79A38 /* C79DA0 802430C0 0C090A90 */ jal func_80242A40_C79720 /* C79DA4 802430C4 02A0302D */ daddu $a2, $s5, $zero /* C79DA8 802430C8 08090C41 */ j .L80243104 -/* C79DAC 802430CC 00000000 */ nop +/* C79DAC 802430CC 00000000 */ nop .L802430D0: /* C79DB0 802430D0 0260202D */ daddu $a0, $s3, $zero /* C79DB4 802430D4 0280282D */ daddu $a1, $s4, $zero /* C79DB8 802430D8 0C090ADD */ jal func_80242B74_C79854 /* C79DBC 802430DC 02A0302D */ daddu $a2, $s5, $zero /* C79DC0 802430E0 08090C41 */ j .L80243104 -/* C79DC4 802430E4 00000000 */ nop +/* C79DC4 802430E4 00000000 */ nop .L802430E8: /* C79DC8 802430E8 0280282D */ daddu $a1, $s4, $zero /* C79DCC 802430EC 0C090B36 */ jal kzn_09_set_script_owner_npc_col_height /* C79DD0 802430F0 02A0302D */ daddu $a2, $s5, $zero /* C79DD4 802430F4 08090C41 */ j .L80243104 -/* C79DD8 802430F8 00000000 */ nop +/* C79DD8 802430F8 00000000 */ nop .L802430FC: /* C79DDC 802430FC 0C0129CF */ jal func_8004A73C /* C79DE0 80243100 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80242D58_C79A38 /* C79E34 80243154 00220821 */ addu $at, $at, $v0 /* C79E38 80243158 8C227440 */ lw $v0, %lo(D_80247440)($at) /* C79E3C 8024315C 00400008 */ jr $v0 -/* C79E40 80243160 00000000 */ nop +/* C79E40 80243160 00000000 */ nop /* C79E44 80243164 8E420028 */ lw $v0, 0x28($s2) /* C79E48 80243168 24420001 */ addiu $v0, $v0, 1 /* C79E4C 8024316C AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index 5abf10da55..b74f6a2dad 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -117,7 +117,7 @@ glabel func_8024092C_C863DC /* C86584 80240AD4 00000000 */ nop /* C86588 80240AD8 0240202D */ daddu $a0, $s2, $zero /* C8658C 80240ADC 0260282D */ daddu $a1, $s3, $zero -/* C86590 80240AE0 0C0126D1 */ jal func_80049B44 +/* C86590 80240AE0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C86594 80240AE4 0280302D */ daddu $a2, $s4, $zero /* C86598 80240AE8 0240202D */ daddu $a0, $s2, $zero /* C8659C 80240AEC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s index 817310cfdf..a67db01488 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -55,7 +55,7 @@ glabel func_80242048_C87AF8 /* C87BBC 8024210C 8E2200B0 */ lw $v0, 0xb0($s1) /* C87BC0 80242110 30420004 */ andi $v0, $v0, 4 /* C87BC4 80242114 10400047 */ beqz $v0, .L80242234 -/* C87BC8 80242118 00000000 */ nop +/* C87BC8 80242118 00000000 */ nop .L8024211C: /* C87BCC 8024211C AE600070 */ sw $zero, 0x70($s3) /* C87BD0 80242120 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80242048_C87AF8 /* C87C74 802421C4 24020028 */ addiu $v0, $zero, 0x28 /* C87C78 802421C8 AFA2001C */ sw $v0, 0x1c($sp) /* C87C7C 802421CC 44833000 */ mtc1 $v1, $f6 -/* C87C80 802421D0 00000000 */ nop +/* C87C80 802421D0 00000000 */ nop /* C87C84 802421D4 468031A0 */ cvt.s.w $f6, $f6 /* C87C88 802421D8 44073000 */ mfc1 $a3, $f6 /* C87C8C 802421DC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80242048_C87AF8 /* C87D44 80242294 10600015 */ beqz $v1, .L802422EC /* C87D48 80242298 0260202D */ daddu $a0, $s3, $zero /* C87D4C 8024229C 080908FD */ j .L802423F4 -/* C87D50 802422A0 00000000 */ nop +/* C87D50 802422A0 00000000 */ nop .L802422A4: /* C87D54 802422A4 1062001C */ beq $v1, $v0, .L80242318 /* C87D58 802422A8 24020003 */ addiu $v0, $zero, 3 /* C87D5C 802422AC 10620035 */ beq $v1, $v0, .L80242384 /* C87D60 802422B0 0260202D */ daddu $a0, $s3, $zero /* C87D64 802422B4 080908FD */ j .L802423F4 -/* C87D68 802422B8 00000000 */ nop +/* C87D68 802422B8 00000000 */ nop .L802422BC: /* C87D6C 802422BC 2402000E */ addiu $v0, $zero, 0xe /* C87D70 802422C0 1062003F */ beq $v1, $v0, .L802423C0 @@ -177,9 +177,9 @@ glabel func_80242048_C87AF8 /* C87D84 802422D4 10620040 */ beq $v1, $v0, .L802423D8 /* C87D88 802422D8 24020063 */ addiu $v0, $zero, 0x63 /* C87D8C 802422DC 10620043 */ beq $v1, $v0, .L802423EC -/* C87D90 802422E0 00000000 */ nop +/* C87D90 802422E0 00000000 */ nop /* C87D94 802422E4 080908FD */ j .L802423F4 -/* C87D98 802422E8 00000000 */ nop +/* C87D98 802422E8 00000000 */ nop .L802422EC: /* C87D9C 802422EC 0280282D */ daddu $a1, $s4, $zero /* C87DA0 802422F0 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80242048_C87AF8 /* C87DB8 80242308 0C0125AE */ jal func_800496B8 /* C87DBC 8024230C 02A0302D */ daddu $a2, $s5, $zero /* C87DC0 80242310 080908FD */ j .L802423F4 -/* C87DC4 80242314 00000000 */ nop +/* C87DC4 80242314 00000000 */ nop .L80242318: /* C87DC8 80242318 0260202D */ daddu $a0, $s3, $zero /* C87DCC 8024231C 0280282D */ daddu $a1, $s4, $zero -/* C87DD0 80242320 0C0126D1 */ jal func_80049B44 +/* C87DD0 80242320 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C87DD4 80242324 02A0302D */ daddu $a2, $s5, $zero /* C87DD8 80242328 8E230088 */ lw $v1, 0x88($s1) /* C87DDC 8024232C 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80242048_C87AF8 /* C87E38 80242388 0C012701 */ jal func_80049C04 /* C87E3C 8024238C 02A0302D */ daddu $a2, $s5, $zero /* C87E40 80242390 080908FD */ j .L802423F4 -/* C87E44 80242394 00000000 */ nop +/* C87E44 80242394 00000000 */ nop .L80242398: /* C87E48 80242398 0260202D */ daddu $a0, $s3, $zero /* C87E4C 8024239C 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80242048_C87AF8 /* C87E60 802423B0 0C09074C */ jal func_80241D30_C877E0 /* C87E64 802423B4 02A0302D */ daddu $a2, $s5, $zero /* C87E68 802423B8 080908FD */ j .L802423F4 -/* C87E6C 802423BC 00000000 */ nop +/* C87E6C 802423BC 00000000 */ nop .L802423C0: /* C87E70 802423C0 0260202D */ daddu $a0, $s3, $zero /* C87E74 802423C4 0280282D */ daddu $a1, $s4, $zero /* C87E78 802423C8 0C090799 */ jal func_80241E64_C87914 /* C87E7C 802423CC 02A0302D */ daddu $a2, $s5, $zero /* C87E80 802423D0 080908FD */ j .L802423F4 -/* C87E84 802423D4 00000000 */ nop +/* C87E84 802423D4 00000000 */ nop .L802423D8: /* C87E88 802423D8 0280282D */ daddu $a1, $s4, $zero /* C87E8C 802423DC 0C0907F2 */ jal kzn_17_set_script_owner_npc_col_height /* C87E90 802423E0 02A0302D */ daddu $a2, $s5, $zero /* C87E94 802423E4 080908FD */ j .L802423F4 -/* C87E98 802423E8 00000000 */ nop +/* C87E98 802423E8 00000000 */ nop .L802423EC: /* C87E9C 802423EC 0C0129CF */ jal func_8004A73C /* C87EA0 802423F0 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80242048_C87AF8 /* C87EF4 80242444 00220821 */ addu $at, $at, $v0 /* C87EF8 80242448 8C226570 */ lw $v0, %lo(D_80246570)($at) /* C87EFC 8024244C 00400008 */ jr $v0 -/* C87F00 80242450 00000000 */ nop +/* C87F00 80242450 00000000 */ nop /* C87F04 80242454 8E420028 */ lw $v0, 0x28($s2) /* C87F08 80242458 24420001 */ addiu $v0, $v0, 1 /* C87F0C 8024245C AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C_7EAF4C.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C_7EAF4C.s deleted file mode 100644 index 1b64c3dd18..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C_7EAF4C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_7EAF4C -/* 7EAF4C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7EAF50 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 7EAF54 80240244 0080802D */ daddu $s0, $a0, $zero -/* 7EAF58 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 7EAF5C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 7EAF60 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 7EAF64 80240254 0C0B210B */ jal get_float_variable -/* 7EAF68 80240258 8C450000 */ lw $a1, ($v0) -/* 7EAF6C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 7EAF70 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 7EAF74 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 7EAF78 80240268 44060000 */ mfc1 $a2, $f0 -/* 7EAF7C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 7EAF80 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 7EAF84 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EAF88 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 7EAF8C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 7EAF90 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 7EAF94 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 7EAF98 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 7EAF9C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 7EAFA0 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAFA4 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 7EAFA8 80240298 0C0B2190 */ jal set_float_variable -/* 7EAFAC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EAFB0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 7EAFB4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAFB8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 7EAFBC 802402AC 0C0B2190 */ jal set_float_variable -/* 7EAFC0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 7EAFC4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 7EAFC8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAFCC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 7EAFD0 802402C0 0C0B2190 */ jal set_float_variable -/* 7EAFD4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 7EAFD8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EAFDC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 7EAFE0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 7EAFE4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 7EAFE8 802402D8 03E00008 */ jr $ra -/* 7EAFEC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_8024023C_8234FC.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_8024023C_8234FC.s deleted file mode 100644 index b1394b64e3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_8024023C_8234FC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8234FC -/* 8234FC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 823500 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 823504 80240244 0080802D */ daddu $s0, $a0, $zero -/* 823508 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 82350C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 823510 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 823514 80240254 0C0B210B */ jal get_float_variable -/* 823518 80240258 8C450000 */ lw $a1, ($v0) -/* 82351C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 823520 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 823524 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 823528 80240268 44060000 */ mfc1 $a2, $f0 -/* 82352C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 823530 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 823534 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 823538 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 82353C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 823540 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 823544 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 823548 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 82354C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 823550 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 823554 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 823558 80240298 0C0B2190 */ jal set_float_variable -/* 82355C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 823560 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 823564 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 823568 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 82356C 802402AC 0C0B2190 */ jal set_float_variable -/* 823570 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 823574 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 823578 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 82357C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 823580 802402C0 0C0B2190 */ jal set_float_variable -/* 823584 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 823588 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 82358C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 823590 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 823594 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 823598 802402D8 03E00008 */ jr $ra -/* 82359C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831800/func_8024023C_831A3C.s b/asm/nonmatchings/world/area_mac/mac_03/831800/func_8024023C_831A3C.s deleted file mode 100644 index 184078e93c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831800/func_8024023C_831A3C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_831A3C -/* 831A3C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 831A40 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 831A44 80240244 0080802D */ daddu $s0, $a0, $zero -/* 831A48 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 831A4C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 831A50 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 831A54 80240254 0C0B210B */ jal get_float_variable -/* 831A58 80240258 8C450000 */ lw $a1, ($v0) -/* 831A5C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 831A60 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 831A64 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 831A68 80240268 44060000 */ mfc1 $a2, $f0 -/* 831A6C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 831A70 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 831A74 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 831A78 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 831A7C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 831A80 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 831A84 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 831A88 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 831A8C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 831A90 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 831A94 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 831A98 80240298 0C0B2190 */ jal set_float_variable -/* 831A9C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 831AA0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 831AA4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 831AA8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 831AAC 802402AC 0C0B2190 */ jal set_float_variable -/* 831AB0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 831AB4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 831AB8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 831ABC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 831AC0 802402C0 0C0B2190 */ jal set_float_variable -/* 831AC4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 831AC8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 831ACC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 831AD0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 831AD4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 831AD8 802402D8 03E00008 */ jr $ra -/* 831ADC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024023C_E0E9DC.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024023C_E0E9DC.s deleted file mode 100644 index ae700c7939..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024023C_E0E9DC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_E0E9DC -/* E0E9DC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0E9E0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* E0E9E4 80240244 0080802D */ daddu $s0, $a0, $zero -/* E0E9E8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* E0E9EC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* E0E9F0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* E0E9F4 80240254 0C0B210B */ jal get_float_variable -/* E0E9F8 80240258 8C450000 */ lw $a1, ($v0) -/* E0E9FC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* E0EA00 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* E0EA04 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* E0EA08 80240268 44060000 */ mfc1 $a2, $f0 -/* E0EA0C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* E0EA10 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* E0EA14 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* E0EA18 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* E0EA1C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* E0EA20 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* E0EA24 80240284 0C00A7E7 */ jal add_vec2D_polar -/* E0EA28 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* E0EA2C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* E0EA30 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* E0EA34 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* E0EA38 80240298 0C0B2190 */ jal set_float_variable -/* E0EA3C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E0EA40 802402A0 0200202D */ daddu $a0, $s0, $zero -/* E0EA44 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* E0EA48 802402A8 4406A000 */ mfc1 $a2, $f20 -/* E0EA4C 802402AC 0C0B2190 */ jal set_float_variable -/* E0EA50 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E0EA54 802402B4 0200202D */ daddu $a0, $s0, $zero -/* E0EA58 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* E0EA5C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* E0EA60 802402C0 0C0B2190 */ jal set_float_variable -/* E0EA64 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E0EA68 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* E0EA6C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* E0EA70 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* E0EA74 802402D4 24020002 */ addiu $v0, $zero, 2 -/* E0EA78 802402D8 03E00008 */ jr $ra -/* E0EA7C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s index ef2df03e21..adf31b25a4 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -117,7 +117,7 @@ glabel func_80240B1C_B93F5C /* B94104 80240CC4 00000000 */ nop /* B94108 80240CC8 0240202D */ daddu $a0, $s2, $zero /* B9410C 80240CCC 0260282D */ daddu $a1, $s3, $zero -/* B94110 80240CD0 0C0126D1 */ jal func_80049B44 +/* B94110 80240CD0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B94114 80240CD4 0280302D */ daddu $a2, $s4, $zero /* B94118 80240CD8 0240202D */ daddu $a0, $s2, $zero /* B9411C 80240CDC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index a016259dae..cba9a0a814 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -117,7 +117,7 @@ glabel func_8024068C_BA0DBC /* BA0F64 80240834 00000000 */ nop /* BA0F68 80240838 0240202D */ daddu $a0, $s2, $zero /* BA0F6C 8024083C 0260282D */ daddu $a1, $s3, $zero -/* BA0F70 80240840 0C0126D1 */ jal func_80049B44 +/* BA0F70 80240840 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BA0F74 80240844 0280302D */ daddu $a2, $s4, $zero /* BA0F78 80240848 0240202D */ daddu $a0, $s2, $zero /* BA0F7C 8024084C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s index e4cadacaa2..d93ea4be7d 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -117,7 +117,7 @@ glabel func_80240B8C_BA530C /* BA54B4 80240D34 00000000 */ nop /* BA54B8 80240D38 0240202D */ daddu $a0, $s2, $zero /* BA54BC 80240D3C 0260282D */ daddu $a1, $s3, $zero -/* BA54C0 80240D40 0C0126D1 */ jal func_80049B44 +/* BA54C0 80240D40 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BA54C4 80240D44 0280302D */ daddu $a2, $s4, $zero /* BA54C8 80240D48 0240202D */ daddu $a0, $s2, $zero /* BA54CC 80240D4C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s index e852f1eafa..46a1c55cd3 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -117,7 +117,7 @@ glabel func_80241BB4_BAF4F4 /* BAF69C 80241D5C 00000000 */ nop /* BAF6A0 80241D60 0240202D */ daddu $a0, $s2, $zero /* BAF6A4 80241D64 0260282D */ daddu $a1, $s3, $zero -/* BAF6A8 80241D68 0C0126D1 */ jal func_80049B44 +/* BAF6A8 80241D68 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BAF6AC 80241D6C 0280302D */ daddu $a2, $s4, $zero /* BAF6B0 80241D70 0240202D */ daddu $a0, $s2, $zero /* BAF6B4 80241D74 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024023C_BB72AC.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024023C_BB72AC.s deleted file mode 100644 index 3bc463e44a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024023C_BB72AC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_BB72AC -/* BB72AC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BB72B0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* BB72B4 80240244 0080802D */ daddu $s0, $a0, $zero -/* BB72B8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* BB72BC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* BB72C0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* BB72C4 80240254 0C0B210B */ jal get_float_variable -/* BB72C8 80240258 8C450000 */ lw $a1, ($v0) -/* BB72CC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* BB72D0 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* BB72D4 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* BB72D8 80240268 44060000 */ mfc1 $a2, $f0 -/* BB72DC 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* BB72E0 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* BB72E4 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* BB72E8 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* BB72EC 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* BB72F0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* BB72F4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* BB72F8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* BB72FC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* BB7300 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* BB7304 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* BB7308 80240298 0C0B2190 */ jal set_float_variable -/* BB730C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BB7310 802402A0 0200202D */ daddu $a0, $s0, $zero -/* BB7314 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* BB7318 802402A8 4406A000 */ mfc1 $a2, $f20 -/* BB731C 802402AC 0C0B2190 */ jal set_float_variable -/* BB7320 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BB7324 802402B4 0200202D */ daddu $a0, $s0, $zero -/* BB7328 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* BB732C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* BB7330 802402C0 0C0B2190 */ jal set_float_variable -/* BB7334 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* BB7338 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* BB733C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* BB7340 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* BB7344 802402D4 24020002 */ addiu $v0, $zero, 2 -/* BB7348 802402D8 03E00008 */ jr $ra -/* BB734C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_8024023C_9D725C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_8024023C_9D725C.s deleted file mode 100644 index 7b09b6f0dd..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_8024023C_9D725C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_9D725C -/* 9D725C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D7260 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 9D7264 80240244 0080802D */ daddu $s0, $a0, $zero -/* 9D7268 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 9D726C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9D7270 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 9D7274 80240254 0C0B210B */ jal get_float_variable -/* 9D7278 80240258 8C450000 */ lw $a1, ($v0) -/* 9D727C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9D7280 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 9D7284 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 9D7288 80240268 44060000 */ mfc1 $a2, $f0 -/* 9D728C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 9D7290 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 9D7294 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D7298 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9D729C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 9D72A0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 9D72A4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 9D72A8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 9D72AC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 9D72B0 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 9D72B4 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 9D72B8 80240298 0C0B2190 */ jal set_float_variable -/* 9D72BC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D72C0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 9D72C4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 9D72C8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 9D72CC 802402AC 0C0B2190 */ jal set_float_variable -/* 9D72D0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9D72D4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 9D72D8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 9D72DC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 9D72E0 802402C0 0C0B2190 */ jal set_float_variable -/* 9D72E4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 9D72E8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D72EC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 9D72F0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9D72F4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 9D72F8 802402D8 03E00008 */ jr $ra -/* 9D72FC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s index 1cdd8cf71d..4036aa08d3 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s @@ -55,7 +55,7 @@ glabel func_80240394_9F4DD4 /* 9F4E98 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 9F4E9C 8024045C 30420004 */ andi $v0, $v0, 4 /* 9F4EA0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9F4EA4 80240464 00000000 */ nop +/* 9F4EA4 80240464 00000000 */ nop .L80240468: /* 9F4EA8 80240468 AE600070 */ sw $zero, 0x70($s3) /* 9F4EAC 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_9F4DD4 /* 9F4F50 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 9F4F54 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 9F4F58 80240518 44833000 */ mtc1 $v1, $f6 -/* 9F4F5C 8024051C 00000000 */ nop +/* 9F4F5C 8024051C 00000000 */ nop /* 9F4F60 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 9F4F64 80240524 44073000 */ mfc1 $a3, $f6 /* 9F4F68 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_9F4DD4 /* 9F5020 802405E0 10600015 */ beqz $v1, .L80240638 /* 9F5024 802405E4 0260202D */ daddu $a0, $s3, $zero /* 9F5028 802405E8 080901D0 */ j .L80240740 -/* 9F502C 802405EC 00000000 */ nop +/* 9F502C 802405EC 00000000 */ nop .L802405F0: /* 9F5030 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 9F5034 802405F4 24020003 */ addiu $v0, $zero, 3 /* 9F5038 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 9F503C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 9F5040 80240600 080901D0 */ j .L80240740 -/* 9F5044 80240604 00000000 */ nop +/* 9F5044 80240604 00000000 */ nop .L80240608: /* 9F5048 80240608 2402000E */ addiu $v0, $zero, 0xe /* 9F504C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_9F4DD4 /* 9F5060 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 9F5064 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 9F5068 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 9F506C 8024062C 00000000 */ nop +/* 9F506C 8024062C 00000000 */ nop /* 9F5070 80240630 080901D0 */ j .L80240740 -/* 9F5074 80240634 00000000 */ nop +/* 9F5074 80240634 00000000 */ nop .L80240638: /* 9F5078 80240638 0280282D */ daddu $a1, $s4, $zero /* 9F507C 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_9F4DD4 /* 9F5094 80240654 0C0125AE */ jal func_800496B8 /* 9F5098 80240658 02A0302D */ daddu $a2, $s5, $zero /* 9F509C 8024065C 080901D0 */ j .L80240740 -/* 9F50A0 80240660 00000000 */ nop +/* 9F50A0 80240660 00000000 */ nop .L80240664: /* 9F50A4 80240664 0260202D */ daddu $a0, $s3, $zero /* 9F50A8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9F50AC 8024066C 0C0126D1 */ jal func_80049B44 +/* 9F50AC 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9F50B0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9F50B4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9F50B8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240394_9F4DD4 /* 9F5114 802406D4 0C012701 */ jal func_80049C04 /* 9F5118 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 9F511C 802406DC 080901D0 */ j .L80240740 -/* 9F5120 802406E0 00000000 */ nop +/* 9F5120 802406E0 00000000 */ nop .L802406E4: /* 9F5124 802406E4 0260202D */ daddu $a0, $s3, $zero /* 9F5128 802406E8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240394_9F4DD4 /* 9F513C 802406FC 0C09001F */ jal func_8024007C_9F4ABC /* 9F5140 80240700 02A0302D */ daddu $a2, $s5, $zero /* 9F5144 80240704 080901D0 */ j .L80240740 -/* 9F5148 80240708 00000000 */ nop +/* 9F5148 80240708 00000000 */ nop .L8024070C: /* 9F514C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 9F5150 80240710 0280282D */ daddu $a1, $s4, $zero /* 9F5154 80240714 0C09006C */ jal func_802401B0_9F4BF0 /* 9F5158 80240718 02A0302D */ daddu $a2, $s5, $zero /* 9F515C 8024071C 080901D0 */ j .L80240740 -/* 9F5160 80240720 00000000 */ nop +/* 9F5160 80240720 00000000 */ nop .L80240724: /* 9F5164 80240724 0280282D */ daddu $a1, $s4, $zero /* 9F5168 80240728 0C0900C5 */ jal func_80240314_9F4D54 /* 9F516C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9F5170 80240730 080901D0 */ j .L80240740 -/* 9F5174 80240734 00000000 */ nop +/* 9F5174 80240734 00000000 */ nop .L80240738: /* 9F5178 80240738 0C0129CF */ jal func_8004A73C /* 9F517C 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240394_9F4DD4 /* 9F51D0 80240790 00220821 */ addu $at, $at, $v0 /* 9F51D4 80240794 8C225CF8 */ lw $v0, %lo(D_80245CF8)($at) /* 9F51D8 80240798 00400008 */ jr $v0 -/* 9F51DC 8024079C 00000000 */ nop +/* 9F51DC 8024079C 00000000 */ nop /* 9F51E0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9F51E4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9F51E8 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s index 2fd68b73d2..78d78c9777 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s @@ -55,7 +55,7 @@ glabel func_80240904_9FB0F4 /* 9FB1B8 802409C8 8E2200B0 */ lw $v0, 0xb0($s1) /* 9FB1BC 802409CC 30420004 */ andi $v0, $v0, 4 /* 9FB1C0 802409D0 10400047 */ beqz $v0, .L80240AF0 -/* 9FB1C4 802409D4 00000000 */ nop +/* 9FB1C4 802409D4 00000000 */ nop .L802409D8: /* 9FB1C8 802409D8 AE600070 */ sw $zero, 0x70($s3) /* 9FB1CC 802409DC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240904_9FB0F4 /* 9FB270 80240A80 24020028 */ addiu $v0, $zero, 0x28 /* 9FB274 80240A84 AFA2001C */ sw $v0, 0x1c($sp) /* 9FB278 80240A88 44833000 */ mtc1 $v1, $f6 -/* 9FB27C 80240A8C 00000000 */ nop +/* 9FB27C 80240A8C 00000000 */ nop /* 9FB280 80240A90 468031A0 */ cvt.s.w $f6, $f6 /* 9FB284 80240A94 44073000 */ mfc1 $a3, $f6 /* 9FB288 80240A98 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240904_9FB0F4 /* 9FB340 80240B50 10600015 */ beqz $v1, .L80240BA8 /* 9FB344 80240B54 0260202D */ daddu $a0, $s3, $zero /* 9FB348 80240B58 0809032C */ j .L80240CB0 -/* 9FB34C 80240B5C 00000000 */ nop +/* 9FB34C 80240B5C 00000000 */ nop .L80240B60: /* 9FB350 80240B60 1062001C */ beq $v1, $v0, .L80240BD4 /* 9FB354 80240B64 24020003 */ addiu $v0, $zero, 3 /* 9FB358 80240B68 10620035 */ beq $v1, $v0, .L80240C40 /* 9FB35C 80240B6C 0260202D */ daddu $a0, $s3, $zero /* 9FB360 80240B70 0809032C */ j .L80240CB0 -/* 9FB364 80240B74 00000000 */ nop +/* 9FB364 80240B74 00000000 */ nop .L80240B78: /* 9FB368 80240B78 2402000E */ addiu $v0, $zero, 0xe /* 9FB36C 80240B7C 1062003F */ beq $v1, $v0, .L80240C7C @@ -177,9 +177,9 @@ glabel func_80240904_9FB0F4 /* 9FB380 80240B90 10620040 */ beq $v1, $v0, .L80240C94 /* 9FB384 80240B94 24020063 */ addiu $v0, $zero, 0x63 /* 9FB388 80240B98 10620043 */ beq $v1, $v0, .L80240CA8 -/* 9FB38C 80240B9C 00000000 */ nop +/* 9FB38C 80240B9C 00000000 */ nop /* 9FB390 80240BA0 0809032C */ j .L80240CB0 -/* 9FB394 80240BA4 00000000 */ nop +/* 9FB394 80240BA4 00000000 */ nop .L80240BA8: /* 9FB398 80240BA8 0280282D */ daddu $a1, $s4, $zero /* 9FB39C 80240BAC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240904_9FB0F4 /* 9FB3B4 80240BC4 0C0125AE */ jal func_800496B8 /* 9FB3B8 80240BC8 02A0302D */ daddu $a2, $s5, $zero /* 9FB3BC 80240BCC 0809032C */ j .L80240CB0 -/* 9FB3C0 80240BD0 00000000 */ nop +/* 9FB3C0 80240BD0 00000000 */ nop .L80240BD4: /* 9FB3C4 80240BD4 0260202D */ daddu $a0, $s3, $zero /* 9FB3C8 80240BD8 0280282D */ daddu $a1, $s4, $zero -/* 9FB3CC 80240BDC 0C0126D1 */ jal func_80049B44 +/* 9FB3CC 80240BDC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9FB3D0 80240BE0 02A0302D */ daddu $a2, $s5, $zero /* 9FB3D4 80240BE4 8E230088 */ lw $v1, 0x88($s1) /* 9FB3D8 80240BE8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240904_9FB0F4 /* 9FB434 80240C44 0C012701 */ jal func_80049C04 /* 9FB438 80240C48 02A0302D */ daddu $a2, $s5, $zero /* 9FB43C 80240C4C 0809032C */ j .L80240CB0 -/* 9FB440 80240C50 00000000 */ nop +/* 9FB440 80240C50 00000000 */ nop .L80240C54: /* 9FB444 80240C54 0260202D */ daddu $a0, $s3, $zero /* 9FB448 80240C58 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240904_9FB0F4 /* 9FB45C 80240C6C 0C09017B */ jal func_802405EC_9FADDC /* 9FB460 80240C70 02A0302D */ daddu $a2, $s5, $zero /* 9FB464 80240C74 0809032C */ j .L80240CB0 -/* 9FB468 80240C78 00000000 */ nop +/* 9FB468 80240C78 00000000 */ nop .L80240C7C: /* 9FB46C 80240C7C 0260202D */ daddu $a0, $s3, $zero /* 9FB470 80240C80 0280282D */ daddu $a1, $s4, $zero /* 9FB474 80240C84 0C0901C8 */ jal func_80240720_9FAF10 /* 9FB478 80240C88 02A0302D */ daddu $a2, $s5, $zero /* 9FB47C 80240C8C 0809032C */ j .L80240CB0 -/* 9FB480 80240C90 00000000 */ nop +/* 9FB480 80240C90 00000000 */ nop .L80240C94: /* 9FB484 80240C94 0280282D */ daddu $a1, $s4, $zero /* 9FB488 80240C98 0C090221 */ jal func_80240884_9FB074 /* 9FB48C 80240C9C 02A0302D */ daddu $a2, $s5, $zero /* 9FB490 80240CA0 0809032C */ j .L80240CB0 -/* 9FB494 80240CA4 00000000 */ nop +/* 9FB494 80240CA4 00000000 */ nop .L80240CA8: /* 9FB498 80240CA8 0C0129CF */ jal func_8004A73C /* 9FB49C 80240CAC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240904_9FB0F4 /* 9FB4F0 80240D00 00220821 */ addu $at, $at, $v0 /* 9FB4F4 80240D04 8C225A78 */ lw $v0, %lo(D_80245A78)($at) /* 9FB4F8 80240D08 00400008 */ jr $v0 -/* 9FB4FC 80240D0C 00000000 */ nop +/* 9FB4FC 80240D0C 00000000 */ nop /* 9FB500 80240D10 8E420028 */ lw $v0, 0x28($s2) /* 9FB504 80240D14 24420001 */ addiu $v0, $v0, 1 /* 9FB508 80240D18 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s index 7dda0243c1..fcfad9f758 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s @@ -55,7 +55,7 @@ glabel func_80240554_A02D94 /* A02E58 80240618 8E2200B0 */ lw $v0, 0xb0($s1) /* A02E5C 8024061C 30420004 */ andi $v0, $v0, 4 /* A02E60 80240620 10400047 */ beqz $v0, .L80240740 -/* A02E64 80240624 00000000 */ nop +/* A02E64 80240624 00000000 */ nop .L80240628: /* A02E68 80240628 AE600070 */ sw $zero, 0x70($s3) /* A02E6C 8024062C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240554_A02D94 /* A02F10 802406D0 24020028 */ addiu $v0, $zero, 0x28 /* A02F14 802406D4 AFA2001C */ sw $v0, 0x1c($sp) /* A02F18 802406D8 44833000 */ mtc1 $v1, $f6 -/* A02F1C 802406DC 00000000 */ nop +/* A02F1C 802406DC 00000000 */ nop /* A02F20 802406E0 468031A0 */ cvt.s.w $f6, $f6 /* A02F24 802406E4 44073000 */ mfc1 $a3, $f6 /* A02F28 802406E8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240554_A02D94 /* A02FE0 802407A0 10600015 */ beqz $v1, .L802407F8 /* A02FE4 802407A4 0260202D */ daddu $a0, $s3, $zero /* A02FE8 802407A8 08090240 */ j .L80240900 -/* A02FEC 802407AC 00000000 */ nop +/* A02FEC 802407AC 00000000 */ nop .L802407B0: /* A02FF0 802407B0 1062001C */ beq $v1, $v0, .L80240824 /* A02FF4 802407B4 24020003 */ addiu $v0, $zero, 3 /* A02FF8 802407B8 10620035 */ beq $v1, $v0, .L80240890 /* A02FFC 802407BC 0260202D */ daddu $a0, $s3, $zero /* A03000 802407C0 08090240 */ j .L80240900 -/* A03004 802407C4 00000000 */ nop +/* A03004 802407C4 00000000 */ nop .L802407C8: /* A03008 802407C8 2402000E */ addiu $v0, $zero, 0xe /* A0300C 802407CC 1062003F */ beq $v1, $v0, .L802408CC @@ -177,9 +177,9 @@ glabel func_80240554_A02D94 /* A03020 802407E0 10620040 */ beq $v1, $v0, .L802408E4 /* A03024 802407E4 24020063 */ addiu $v0, $zero, 0x63 /* A03028 802407E8 10620043 */ beq $v1, $v0, .L802408F8 -/* A0302C 802407EC 00000000 */ nop +/* A0302C 802407EC 00000000 */ nop /* A03030 802407F0 08090240 */ j .L80240900 -/* A03034 802407F4 00000000 */ nop +/* A03034 802407F4 00000000 */ nop .L802407F8: /* A03038 802407F8 0280282D */ daddu $a1, $s4, $zero /* A0303C 802407FC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240554_A02D94 /* A03054 80240814 0C0125AE */ jal func_800496B8 /* A03058 80240818 02A0302D */ daddu $a2, $s5, $zero /* A0305C 8024081C 08090240 */ j .L80240900 -/* A03060 80240820 00000000 */ nop +/* A03060 80240820 00000000 */ nop .L80240824: /* A03064 80240824 0260202D */ daddu $a0, $s3, $zero /* A03068 80240828 0280282D */ daddu $a1, $s4, $zero -/* A0306C 8024082C 0C0126D1 */ jal func_80049B44 +/* A0306C 8024082C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A03070 80240830 02A0302D */ daddu $a2, $s5, $zero /* A03074 80240834 8E230088 */ lw $v1, 0x88($s1) /* A03078 80240838 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240554_A02D94 /* A030D4 80240894 0C012701 */ jal func_80049C04 /* A030D8 80240898 02A0302D */ daddu $a2, $s5, $zero /* A030DC 8024089C 08090240 */ j .L80240900 -/* A030E0 802408A0 00000000 */ nop +/* A030E0 802408A0 00000000 */ nop .L802408A4: /* A030E4 802408A4 0260202D */ daddu $a0, $s3, $zero /* A030E8 802408A8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240554_A02D94 /* A030FC 802408BC 0C09008F */ jal func_8024023C_A02A7C /* A03100 802408C0 02A0302D */ daddu $a2, $s5, $zero /* A03104 802408C4 08090240 */ j .L80240900 -/* A03108 802408C8 00000000 */ nop +/* A03108 802408C8 00000000 */ nop .L802408CC: /* A0310C 802408CC 0260202D */ daddu $a0, $s3, $zero /* A03110 802408D0 0280282D */ daddu $a1, $s4, $zero /* A03114 802408D4 0C0900DC */ jal func_80240370_A02BB0 /* A03118 802408D8 02A0302D */ daddu $a2, $s5, $zero /* A0311C 802408DC 08090240 */ j .L80240900 -/* A03120 802408E0 00000000 */ nop +/* A03120 802408E0 00000000 */ nop .L802408E4: /* A03124 802408E4 0280282D */ daddu $a1, $s4, $zero /* A03128 802408E8 0C090135 */ jal func_802404D4_A02D14 /* A0312C 802408EC 02A0302D */ daddu $a2, $s5, $zero /* A03130 802408F0 08090240 */ j .L80240900 -/* A03134 802408F4 00000000 */ nop +/* A03134 802408F4 00000000 */ nop .L802408F8: /* A03138 802408F8 0C0129CF */ jal func_8004A73C /* A0313C 802408FC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240554_A02D94 /* A03190 80240950 00220821 */ addu $at, $at, $v0 /* A03194 80240954 8C2245C8 */ lw $v0, %lo(D_802445C8)($at) /* A03198 80240958 00400008 */ jr $v0 -/* A0319C 8024095C 00000000 */ nop +/* A0319C 8024095C 00000000 */ nop /* A031A0 80240960 8E420028 */ lw $v0, 0x28($s2) /* A031A4 80240964 24420001 */ addiu $v0, $v0, 1 /* A031A8 80240968 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024023C_A0713C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024023C_A0713C.s deleted file mode 100644 index db8d339636..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024023C_A0713C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_A0713C -/* A0713C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A07140 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* A07144 80240244 0080802D */ daddu $s0, $a0, $zero -/* A07148 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* A0714C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* A07150 80240250 8E02000C */ lw $v0, 0xc($s0) -/* A07154 80240254 0C0B210B */ jal get_float_variable -/* A07158 80240258 8C450000 */ lw $a1, ($v0) -/* A0715C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* A07160 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A07164 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A07168 80240268 44060000 */ mfc1 $a2, $f0 -/* A0716C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* A07170 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* A07174 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* A07178 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* A0717C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* A07180 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* A07184 80240284 0C00A7E7 */ jal add_vec2D_polar -/* A07188 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* A0718C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* A07190 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* A07194 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* A07198 80240298 0C0B2190 */ jal set_float_variable -/* A0719C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A071A0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* A071A4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* A071A8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* A071AC 802402AC 0C0B2190 */ jal set_float_variable -/* A071B0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A071B4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* A071B8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* A071BC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* A071C0 802402C0 0C0B2190 */ jal set_float_variable -/* A071C4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A071C8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* A071CC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* A071D0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A071D4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* A071D8 802402D8 03E00008 */ jr $ra -/* A071DC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s index c31cf0ae6c..a96d1d3941 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s @@ -55,7 +55,7 @@ glabel func_80240674_A07574 /* A07638 80240738 8E2200B0 */ lw $v0, 0xb0($s1) /* A0763C 8024073C 30420004 */ andi $v0, $v0, 4 /* A07640 80240740 10400047 */ beqz $v0, .L80240860 -/* A07644 80240744 00000000 */ nop +/* A07644 80240744 00000000 */ nop .L80240748: /* A07648 80240748 AE600070 */ sw $zero, 0x70($s3) /* A0764C 8024074C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240674_A07574 /* A076F0 802407F0 24020028 */ addiu $v0, $zero, 0x28 /* A076F4 802407F4 AFA2001C */ sw $v0, 0x1c($sp) /* A076F8 802407F8 44833000 */ mtc1 $v1, $f6 -/* A076FC 802407FC 00000000 */ nop +/* A076FC 802407FC 00000000 */ nop /* A07700 80240800 468031A0 */ cvt.s.w $f6, $f6 /* A07704 80240804 44073000 */ mfc1 $a3, $f6 /* A07708 80240808 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240674_A07574 /* A077C0 802408C0 10600015 */ beqz $v1, .L80240918 /* A077C4 802408C4 0260202D */ daddu $a0, $s3, $zero /* A077C8 802408C8 08090288 */ j .L80240A20 -/* A077CC 802408CC 00000000 */ nop +/* A077CC 802408CC 00000000 */ nop .L802408D0: /* A077D0 802408D0 1062001C */ beq $v1, $v0, .L80240944 /* A077D4 802408D4 24020003 */ addiu $v0, $zero, 3 /* A077D8 802408D8 10620035 */ beq $v1, $v0, .L802409B0 /* A077DC 802408DC 0260202D */ daddu $a0, $s3, $zero /* A077E0 802408E0 08090288 */ j .L80240A20 -/* A077E4 802408E4 00000000 */ nop +/* A077E4 802408E4 00000000 */ nop .L802408E8: /* A077E8 802408E8 2402000E */ addiu $v0, $zero, 0xe /* A077EC 802408EC 1062003F */ beq $v1, $v0, .L802409EC @@ -177,9 +177,9 @@ glabel func_80240674_A07574 /* A07800 80240900 10620040 */ beq $v1, $v0, .L80240A04 /* A07804 80240904 24020063 */ addiu $v0, $zero, 0x63 /* A07808 80240908 10620043 */ beq $v1, $v0, .L80240A18 -/* A0780C 8024090C 00000000 */ nop +/* A0780C 8024090C 00000000 */ nop /* A07810 80240910 08090288 */ j .L80240A20 -/* A07814 80240914 00000000 */ nop +/* A07814 80240914 00000000 */ nop .L80240918: /* A07818 80240918 0280282D */ daddu $a1, $s4, $zero /* A0781C 8024091C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240674_A07574 /* A07834 80240934 0C0125AE */ jal func_800496B8 /* A07838 80240938 02A0302D */ daddu $a2, $s5, $zero /* A0783C 8024093C 08090288 */ j .L80240A20 -/* A07840 80240940 00000000 */ nop +/* A07840 80240940 00000000 */ nop .L80240944: /* A07844 80240944 0260202D */ daddu $a0, $s3, $zero /* A07848 80240948 0280282D */ daddu $a1, $s4, $zero -/* A0784C 8024094C 0C0126D1 */ jal func_80049B44 +/* A0784C 8024094C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A07850 80240950 02A0302D */ daddu $a2, $s5, $zero /* A07854 80240954 8E230088 */ lw $v1, 0x88($s1) /* A07858 80240958 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240674_A07574 /* A078B4 802409B4 0C012701 */ jal func_80049C04 /* A078B8 802409B8 02A0302D */ daddu $a2, $s5, $zero /* A078BC 802409BC 08090288 */ j .L80240A20 -/* A078C0 802409C0 00000000 */ nop +/* A078C0 802409C0 00000000 */ nop .L802409C4: /* A078C4 802409C4 0260202D */ daddu $a0, $s3, $zero /* A078C8 802409C8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240674_A07574 /* A078DC 802409DC 0C0900D7 */ jal func_8024035C_A0725C /* A078E0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* A078E4 802409E4 08090288 */ j .L80240A20 -/* A078E8 802409E8 00000000 */ nop +/* A078E8 802409E8 00000000 */ nop .L802409EC: /* A078EC 802409EC 0260202D */ daddu $a0, $s3, $zero /* A078F0 802409F0 0280282D */ daddu $a1, $s4, $zero /* A078F4 802409F4 0C090124 */ jal func_80240490_A07390 /* A078F8 802409F8 02A0302D */ daddu $a2, $s5, $zero /* A078FC 802409FC 08090288 */ j .L80240A20 -/* A07900 80240A00 00000000 */ nop +/* A07900 80240A00 00000000 */ nop .L80240A04: /* A07904 80240A04 0280282D */ daddu $a1, $s4, $zero /* A07908 80240A08 0C09017D */ jal func_802405F4_A074F4 /* A0790C 80240A0C 02A0302D */ daddu $a2, $s5, $zero /* A07910 80240A10 08090288 */ j .L80240A20 -/* A07914 80240A14 00000000 */ nop +/* A07914 80240A14 00000000 */ nop .L80240A18: /* A07918 80240A18 0C0129CF */ jal func_8004A73C /* A0791C 80240A1C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240674_A07574 /* A07970 80240A70 00220821 */ addu $at, $at, $v0 /* A07974 80240A74 8C224CF8 */ lw $v0, %lo(D_80244CF8)($at) /* A07978 80240A78 00400008 */ jr $v0 -/* A0797C 80240A7C 00000000 */ nop +/* A0797C 80240A7C 00000000 */ nop /* A07980 80240A80 8E420028 */ lw $v0, 0x28($s2) /* A07984 80240A84 24420001 */ addiu $v0, $v0, 1 /* A07988 80240A88 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s index 3db71d6686..e539298598 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s @@ -46,7 +46,7 @@ glabel func_802409EC_D9B8DC /* D9B980 80240A90 8E2200B0 */ lw $v0, 0xb0($s1) /* D9B984 80240A94 30420004 */ andi $v0, $v0, 4 /* D9B988 80240A98 1040001F */ beqz $v0, .L80240B18 -/* D9B98C 80240A9C 00000000 */ nop +/* D9B98C 80240A9C 00000000 */ nop .L80240AA0: /* D9B990 80240AA0 2404F7FF */ addiu $a0, $zero, -0x801 /* D9B994 80240AA4 AE800070 */ sw $zero, 0x70($s4) @@ -89,7 +89,7 @@ glabel func_802409EC_D9B8DC /* D9BA1C 80240B2C 00220821 */ addu $at, $at, $v0 /* D9BA20 80240B30 8C222448 */ lw $v0, %lo(D_80242448)($at) /* D9BA24 80240B34 00400008 */ jr $v0 -/* D9BA28 80240B38 00000000 */ nop +/* D9BA28 80240B38 00000000 */ nop /* D9BA2C 80240B3C 0280202D */ daddu $a0, $s4, $zero /* D9BA30 80240B40 0240282D */ daddu $a1, $s2, $zero /* D9BA34 80240B44 0C012568 */ jal func_800495A0 @@ -99,17 +99,17 @@ glabel func_802409EC_D9B8DC /* D9BA44 80240B54 0C0125AE */ jal func_800496B8 /* D9BA48 80240B58 0260302D */ daddu $a2, $s3, $zero /* D9BA4C 80240B5C 080902FF */ j .L80240BFC -/* D9BA50 80240B60 00000000 */ nop +/* D9BA50 80240B60 00000000 */ nop /* D9BA54 80240B64 0280202D */ daddu $a0, $s4, $zero /* D9BA58 80240B68 0240282D */ daddu $a1, $s2, $zero -/* D9BA5C 80240B6C 0C0126D1 */ jal func_80049B44 +/* D9BA5C 80240B6C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9BA60 80240B70 0260302D */ daddu $a2, $s3, $zero /* D9BA64 80240B74 0280202D */ daddu $a0, $s4, $zero /* D9BA68 80240B78 0240282D */ daddu $a1, $s2, $zero /* D9BA6C 80240B7C 0C012701 */ jal func_80049C04 /* D9BA70 80240B80 0260302D */ daddu $a2, $s3, $zero /* D9BA74 80240B84 080902FF */ j .L80240BFC -/* D9BA78 80240B88 00000000 */ nop +/* D9BA78 80240B88 00000000 */ nop /* D9BA7C 80240B8C 0280202D */ daddu $a0, $s4, $zero /* D9BA80 80240B90 0240282D */ daddu $a1, $s2, $zero /* D9BA84 80240B94 0C01278F */ jal func_80049E3C @@ -119,7 +119,7 @@ glabel func_802409EC_D9B8DC /* D9BA94 80240BA4 0C0127B3 */ jal func_80049ECC /* D9BA98 80240BA8 0260302D */ daddu $a2, $s3, $zero /* D9BA9C 80240BAC 080902FF */ j .L80240BFC -/* D9BAA0 80240BB0 00000000 */ nop +/* D9BAA0 80240BB0 00000000 */ nop /* D9BAA4 80240BB4 0280202D */ daddu $a0, $s4, $zero /* D9BAA8 80240BB8 0240282D */ daddu $a1, $s2, $zero /* D9BAAC 80240BBC 0C090098 */ jal func_80240260_D9B150 @@ -129,13 +129,13 @@ glabel func_802409EC_D9B8DC /* D9BABC 80240BCC 0C090211 */ jal func_80240844_D9B734 /* D9BAC0 80240BD0 0260302D */ daddu $a2, $s3, $zero /* D9BAC4 80240BD4 080902FF */ j .L80240BFC -/* D9BAC8 80240BD8 00000000 */ nop +/* D9BAC8 80240BD8 00000000 */ nop /* D9BACC 80240BDC 0280202D */ daddu $a0, $s4, $zero /* D9BAD0 80240BE0 0240282D */ daddu $a1, $s2, $zero /* D9BAD4 80240BE4 0C09026A */ jal func_802409A8_D9B898 /* D9BAD8 80240BE8 0260302D */ daddu $a2, $s3, $zero /* D9BADC 80240BEC 080902FF */ j .L80240BFC -/* D9BAE0 80240BF0 00000000 */ nop +/* D9BAE0 80240BF0 00000000 */ nop /* D9BAE4 80240BF4 0C0129CF */ jal func_8004A73C /* D9BAE8 80240BF8 0280202D */ daddu $a0, $s4, $zero .L80240BFC: @@ -149,6 +149,6 @@ glabel func_802409EC_D9B8DC /* D9BB08 80240C18 0000102D */ daddu $v0, $zero, $zero /* D9BB0C 80240C1C 03E00008 */ jr $ra /* D9BB10 80240C20 27BD0050 */ addiu $sp, $sp, 0x50 -/* D9BB14 80240C24 00000000 */ nop -/* D9BB18 80240C28 00000000 */ nop -/* D9BB1C 80240C2C 00000000 */ nop +/* D9BB14 80240C24 00000000 */ nop +/* D9BB18 80240C28 00000000 */ nop +/* D9BB1C 80240C2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s index d7c2f46f8c..2bed2a59ba 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s @@ -46,7 +46,7 @@ glabel func_80240BA8_D9E078 /* D9E11C 80240C4C 8E2200B0 */ lw $v0, 0xb0($s1) /* D9E120 80240C50 30420004 */ andi $v0, $v0, 4 /* D9E124 80240C54 10400044 */ beqz $v0, .L80240D68 -/* D9E128 80240C58 00000000 */ nop +/* D9E128 80240C58 00000000 */ nop .L80240C5C: /* D9E12C 80240C5C 2404F7FF */ addiu $a0, $zero, -0x801 /* D9E130 80240C60 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240BA8_D9E078 /* D9E1F0 80240D20 C640003C */ lwc1 $f0, 0x3c($s2) /* D9E1F4 80240D24 C6420040 */ lwc1 $f2, 0x40($s2) /* D9E1F8 80240D28 44822000 */ mtc1 $v0, $f4 -/* D9E1FC 80240D2C 00000000 */ nop +/* D9E1FC 80240D2C 00000000 */ nop /* D9E200 80240D30 46802120 */ cvt.s.w $f4, $f4 /* D9E204 80240D34 27A20044 */ addiu $v0, $sp, 0x44 /* D9E208 80240D38 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240BA8_D9E078 /* D9E220 80240D50 0C0372DF */ jal func_800DCB7C /* D9E224 80240D54 27A6003C */ addiu $a2, $sp, 0x3c /* D9E228 80240D58 10400003 */ beqz $v0, .L80240D68 -/* D9E22C 80240D5C 00000000 */ nop +/* D9E22C 80240D5C 00000000 */ nop /* D9E230 80240D60 C7A0003C */ lwc1 $f0, 0x3c($sp) /* D9E234 80240D64 E640003C */ swc1 $f0, 0x3c($s2) .L80240D68: @@ -128,7 +128,7 @@ glabel func_80240BA8_D9E078 /* D9E24C 80240D7C 00220821 */ addu $at, $at, $v0 /* D9E250 80240D80 8C227880 */ lw $v0, %lo(D_80247880)($at) /* D9E254 80240D84 00400008 */ jr $v0 -/* D9E258 80240D88 00000000 */ nop +/* D9E258 80240D88 00000000 */ nop /* D9E25C 80240D8C 0260202D */ daddu $a0, $s3, $zero /* D9E260 80240D90 0280282D */ daddu $a1, $s4, $zero /* D9E264 80240D94 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240BA8_D9E078 /* D9E274 80240DA4 0C0125AE */ jal func_800496B8 /* D9E278 80240DA8 02A0302D */ daddu $a2, $s5, $zero /* D9E27C 80240DAC 080903AD */ j .L80240EB4 -/* D9E280 80240DB0 00000000 */ nop +/* D9E280 80240DB0 00000000 */ nop /* D9E284 80240DB4 0260202D */ daddu $a0, $s3, $zero /* D9E288 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* D9E28C 80240DBC 0C0126D1 */ jal func_80049B44 +/* D9E28C 80240DBC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9E290 80240DC0 02A0302D */ daddu $a2, $s5, $zero /* D9E294 80240DC4 0260202D */ daddu $a0, $s3, $zero /* D9E298 80240DC8 0280282D */ daddu $a1, $s4, $zero /* D9E29C 80240DCC 0C012701 */ jal func_80049C04 /* D9E2A0 80240DD0 02A0302D */ daddu $a2, $s5, $zero /* D9E2A4 80240DD4 080903AD */ j .L80240EB4 -/* D9E2A8 80240DD8 00000000 */ nop +/* D9E2A8 80240DD8 00000000 */ nop /* D9E2AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* D9E2B0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* D9E2B4 80240DE4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240BA8_D9E078 /* D9E2C4 80240DF4 0C0127B3 */ jal func_80049ECC /* D9E2C8 80240DF8 02A0302D */ daddu $a2, $s5, $zero /* D9E2CC 80240DFC 080903AD */ j .L80240EB4 -/* D9E2D0 80240E00 00000000 */ nop +/* D9E2D0 80240E00 00000000 */ nop /* D9E2D4 80240E04 0260202D */ daddu $a0, $s3, $zero /* D9E2D8 80240E08 0280282D */ daddu $a1, $s4, $zero /* D9E2DC 80240E0C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240BA8_D9E078 /* D9E2F4 80240E24 8E630070 */ lw $v1, 0x70($s3) /* D9E2F8 80240E28 2402000E */ addiu $v0, $zero, 0xe /* D9E2FC 80240E2C 14620021 */ bne $v1, $v0, .L80240EB4 -/* D9E300 80240E30 00000000 */ nop +/* D9E300 80240E30 00000000 */ nop /* D9E304 80240E34 0260202D */ daddu $a0, $s3, $zero /* D9E308 80240E38 0280282D */ daddu $a1, $s4, $zero /* D9E30C 80240E3C 0C09025C */ jal func_80240970_D9DE40 @@ -178,7 +178,7 @@ glabel func_80240BA8_D9E078 /* D9E314 80240E44 8E630070 */ lw $v1, 0x70($s3) /* D9E318 80240E48 2402000F */ addiu $v0, $zero, 0xf /* D9E31C 80240E4C 14620019 */ bne $v1, $v0, .L80240EB4 -/* D9E320 80240E50 00000000 */ nop +/* D9E320 80240E50 00000000 */ nop /* D9E324 80240E54 0260202D */ daddu $a0, $s3, $zero /* D9E328 80240E58 0280282D */ daddu $a1, $s4, $zero /* D9E32C 80240E5C 0C090278 */ jal func_802409E0_D9DEB0 @@ -186,7 +186,7 @@ glabel func_80240BA8_D9E078 /* D9E334 80240E64 8E630070 */ lw $v1, 0x70($s3) /* D9E338 80240E68 24020010 */ addiu $v0, $zero, 0x10 /* D9E33C 80240E6C 14620011 */ bne $v1, $v0, .L80240EB4 -/* D9E340 80240E70 00000000 */ nop +/* D9E340 80240E70 00000000 */ nop /* D9E344 80240E74 0260202D */ daddu $a0, $s3, $zero /* D9E348 80240E78 0280282D */ daddu $a1, $s4, $zero /* D9E34C 80240E7C 0C0902AC */ jal func_80240AB0_D9DF80 @@ -194,13 +194,13 @@ glabel func_80240BA8_D9E078 /* D9E354 80240E84 8E630070 */ lw $v1, 0x70($s3) /* D9E358 80240E88 24020011 */ addiu $v0, $zero, 0x11 /* D9E35C 80240E8C 14620009 */ bne $v1, $v0, .L80240EB4 -/* D9E360 80240E90 00000000 */ nop +/* D9E360 80240E90 00000000 */ nop /* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero /* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero /* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48_D9E018 /* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero /* D9E374 80240EA4 080903AD */ j .L80240EB4 -/* D9E378 80240EA8 00000000 */ nop +/* D9E378 80240EA8 00000000 */ nop /* D9E37C 80240EAC 0C0129CF */ jal func_8004A73C /* D9E380 80240EB0 0260202D */ daddu $a0, $s3, $zero .L80240EB4: diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index 9d391fc343..a5f47f64fb 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -46,7 +46,7 @@ glabel func_8024283C_D9FD0C /* D9FDB0 802428E0 8E4200B0 */ lw $v0, 0xb0($s2) /* D9FDB4 802428E4 30420004 */ andi $v0, $v0, 4 /* D9FDB8 802428E8 1040002F */ beqz $v0, .L802429A8 -/* D9FDBC 802428EC 00000000 */ nop +/* D9FDBC 802428EC 00000000 */ nop .L802428F0: /* D9FDC0 802428F0 2404F7FF */ addiu $a0, $zero, -0x801 /* D9FDC4 802428F4 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_8024283C_D9FD0C /* D9FE8C 802429BC 00220821 */ addu $at, $at, $v0 /* D9FE90 802429C0 8C227BE0 */ lw $v0, %lo(D_80247BE0)($at) /* D9FE94 802429C4 00400008 */ jr $v0 -/* D9FE98 802429C8 00000000 */ nop +/* D9FE98 802429C8 00000000 */ nop /* D9FE9C 802429CC 0260202D */ daddu $a0, $s3, $zero /* D9FEA0 802429D0 0200282D */ daddu $a1, $s0, $zero /* D9FEA4 802429D4 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_8024283C_D9FD0C /* D9FEB4 802429E4 0C0125AE */ jal func_800496B8 /* D9FEB8 802429E8 02A0302D */ daddu $a2, $s5, $zero /* D9FEBC 802429EC 08090ACD */ j .L80242B34 -/* D9FEC0 802429F0 00000000 */ nop +/* D9FEC0 802429F0 00000000 */ nop /* D9FEC4 802429F4 0260202D */ daddu $a0, $s3, $zero /* D9FEC8 802429F8 0200282D */ daddu $a1, $s0, $zero -/* D9FECC 802429FC 0C0126D1 */ jal func_80049B44 +/* D9FECC 802429FC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9FED0 80242A00 02A0302D */ daddu $a2, $s5, $zero /* D9FED4 80242A04 0260202D */ daddu $a0, $s3, $zero /* D9FED8 80242A08 0200282D */ daddu $a1, $s0, $zero /* D9FEDC 80242A0C 0C012701 */ jal func_80049C04 /* D9FEE0 80242A10 02A0302D */ daddu $a2, $s5, $zero /* D9FEE4 80242A14 08090ACD */ j .L80242B34 -/* D9FEE8 80242A18 00000000 */ nop +/* D9FEE8 80242A18 00000000 */ nop /* D9FEEC 80242A1C 0260202D */ daddu $a0, $s3, $zero /* D9FEF0 80242A20 0200282D */ daddu $a1, $s0, $zero /* D9FEF4 80242A24 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_8024283C_D9FD0C /* D9FF04 80242A34 0C0127B3 */ jal func_80049ECC /* D9FF08 80242A38 02A0302D */ daddu $a2, $s5, $zero /* D9FF0C 80242A3C 08090ACD */ j .L80242B34 -/* D9FF10 80242A40 00000000 */ nop +/* D9FF10 80242A40 00000000 */ nop /* D9FF14 80242A44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* D9FF18 80242A48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* D9FF1C 80242A4C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_8024283C_D9FD0C /* D9FF34 80242A64 10400008 */ beqz $v0, .L80242A88 /* D9FF38 80242A68 46000086 */ mov.s $f2, $f0 /* D9FF3C 80242A6C 44820000 */ mtc1 $v0, $f0 -/* D9FF40 80242A70 00000000 */ nop +/* D9FF40 80242A70 00000000 */ nop /* D9FF44 80242A74 46800020 */ cvt.s.w $f0, $f0 /* D9FF48 80242A78 4602003C */ c.lt.s $f0, $f2 -/* D9FF4C 80242A7C 00000000 */ nop +/* D9FF4C 80242A7C 00000000 */ nop /* D9FF50 80242A80 4500000B */ bc1f .L80242AB0 /* D9FF54 80242A84 0260202D */ daddu $a0, $s3, $zero .L80242A88: @@ -164,7 +164,7 @@ glabel func_8024283C_D9FD0C /* D9FF6C 80242A9C 8E630070 */ lw $v1, 0x70($s3) /* D9FF70 80242AA0 2402000C */ addiu $v0, $zero, 0xc /* D9FF74 80242AA4 14620023 */ bne $v1, $v0, .L80242B34 -/* D9FF78 80242AA8 00000000 */ nop +/* D9FF78 80242AA8 00000000 */ nop /* D9FF7C 80242AAC 0260202D */ daddu $a0, $s3, $zero .L80242AB0: /* D9FF80 80242AB0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_8024283C_D9FD0C /* D9FF94 80242AC4 0C012849 */ jal func_8004A124 /* D9FF98 80242AC8 02A0302D */ daddu $a2, $s5, $zero /* D9FF9C 80242ACC 08090ACD */ j .L80242B34 -/* D9FFA0 80242AD0 00000000 */ nop +/* D9FFA0 80242AD0 00000000 */ nop /* D9FFA4 80242AD4 0260202D */ daddu $a0, $s3, $zero /* D9FFA8 80242AD8 0200282D */ daddu $a1, $s0, $zero /* D9FFAC 80242ADC 0C0128FA */ jal func_8004A3E8 /* D9FFB0 80242AE0 02A0302D */ daddu $a2, $s5, $zero /* D9FFB4 80242AE4 08090ACD */ j .L80242B34 -/* D9FFB8 80242AE8 00000000 */ nop +/* D9FFB8 80242AE8 00000000 */ nop /* D9FFBC 80242AEC 0C09071F */ jal func_80241C7C_D9F14C /* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero /* D9FFC4 80242AF4 08090ACD */ j .L80242B34 -/* D9FFC8 80242AF8 00000000 */ nop +/* D9FFC8 80242AF8 00000000 */ nop /* D9FFCC 80242AFC 0C09075F */ jal omo_02_UnkSetDurationFunc /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero /* D9FFD4 80242B04 08090ACD */ j .L80242B34 -/* D9FFD8 80242B08 00000000 */ nop +/* D9FFD8 80242B08 00000000 */ nop /* D9FFDC 80242B0C 0C090770 */ jal omo_02_UnkNpcAIFunc9 /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero /* D9FFE4 80242B14 08090ACD */ j .L80242B34 -/* D9FFE8 80242B18 00000000 */ nop +/* D9FFE8 80242B18 00000000 */ nop /* D9FFEC 80242B1C 0C090798 */ jal omo_02_UnkDurationCheck /* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero /* D9FFF4 80242B24 08090ACD */ j .L80242B34 -/* D9FFF8 80242B28 00000000 */ nop +/* D9FFF8 80242B28 00000000 */ nop /* D9FFFC 80242B2C 0C0129CF */ jal func_8004A73C /* DA0000 80242B30 0260202D */ daddu $a0, $s3, $zero .L80242B34: diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s index f614d7a69d..133db90d8d 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s @@ -46,7 +46,7 @@ glabel func_80241AD0_DAEED0 /* DAEF74 80241B74 8E2200B0 */ lw $v0, 0xb0($s1) /* DAEF78 80241B78 30420004 */ andi $v0, $v0, 4 /* DAEF7C 80241B7C 10400044 */ beqz $v0, .L80241C90 -/* DAEF80 80241B80 00000000 */ nop +/* DAEF80 80241B80 00000000 */ nop .L80241B84: /* DAEF84 80241B84 2404F7FF */ addiu $a0, $zero, -0x801 /* DAEF88 80241B88 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80241AD0_DAEED0 /* DAF048 80241C48 C640003C */ lwc1 $f0, 0x3c($s2) /* DAF04C 80241C4C C6420040 */ lwc1 $f2, 0x40($s2) /* DAF050 80241C50 44822000 */ mtc1 $v0, $f4 -/* DAF054 80241C54 00000000 */ nop +/* DAF054 80241C54 00000000 */ nop /* DAF058 80241C58 46802120 */ cvt.s.w $f4, $f4 /* DAF05C 80241C5C 27A20044 */ addiu $v0, $sp, 0x44 /* DAF060 80241C60 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80241AD0_DAEED0 /* DAF078 80241C78 0C0372DF */ jal func_800DCB7C /* DAF07C 80241C7C 27A6003C */ addiu $a2, $sp, 0x3c /* DAF080 80241C80 10400003 */ beqz $v0, .L80241C90 -/* DAF084 80241C84 00000000 */ nop +/* DAF084 80241C84 00000000 */ nop /* DAF088 80241C88 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DAF08C 80241C8C E640003C */ swc1 $f0, 0x3c($s2) .L80241C90: @@ -128,7 +128,7 @@ glabel func_80241AD0_DAEED0 /* DAF0A4 80241CA4 00220821 */ addu $at, $at, $v0 /* DAF0A8 80241CA8 8C224D18 */ lw $v0, %lo(D_80244D18)($at) /* DAF0AC 80241CAC 00400008 */ jr $v0 -/* DAF0B0 80241CB0 00000000 */ nop +/* DAF0B0 80241CB0 00000000 */ nop /* DAF0B4 80241CB4 0260202D */ daddu $a0, $s3, $zero /* DAF0B8 80241CB8 0280282D */ daddu $a1, $s4, $zero /* DAF0BC 80241CBC 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80241AD0_DAEED0 /* DAF0CC 80241CCC 0C0125AE */ jal func_800496B8 /* DAF0D0 80241CD0 02A0302D */ daddu $a2, $s5, $zero /* DAF0D4 80241CD4 08090777 */ j .L80241DDC -/* DAF0D8 80241CD8 00000000 */ nop +/* DAF0D8 80241CD8 00000000 */ nop /* DAF0DC 80241CDC 0260202D */ daddu $a0, $s3, $zero /* DAF0E0 80241CE0 0280282D */ daddu $a1, $s4, $zero -/* DAF0E4 80241CE4 0C0126D1 */ jal func_80049B44 +/* DAF0E4 80241CE4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DAF0E8 80241CE8 02A0302D */ daddu $a2, $s5, $zero /* DAF0EC 80241CEC 0260202D */ daddu $a0, $s3, $zero /* DAF0F0 80241CF0 0280282D */ daddu $a1, $s4, $zero /* DAF0F4 80241CF4 0C012701 */ jal func_80049C04 /* DAF0F8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DAF0FC 80241CFC 08090777 */ j .L80241DDC -/* DAF100 80241D00 00000000 */ nop +/* DAF100 80241D00 00000000 */ nop /* DAF104 80241D04 0260202D */ daddu $a0, $s3, $zero /* DAF108 80241D08 0280282D */ daddu $a1, $s4, $zero /* DAF10C 80241D0C 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80241AD0_DAEED0 /* DAF11C 80241D1C 0C0127B3 */ jal func_80049ECC /* DAF120 80241D20 02A0302D */ daddu $a2, $s5, $zero /* DAF124 80241D24 08090777 */ j .L80241DDC -/* DAF128 80241D28 00000000 */ nop +/* DAF128 80241D28 00000000 */ nop /* DAF12C 80241D2C 0260202D */ daddu $a0, $s3, $zero /* DAF130 80241D30 0280282D */ daddu $a1, $s4, $zero /* DAF134 80241D34 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80241AD0_DAEED0 /* DAF14C 80241D4C 8E630070 */ lw $v1, 0x70($s3) /* DAF150 80241D50 2402000E */ addiu $v0, $zero, 0xe /* DAF154 80241D54 14620021 */ bne $v1, $v0, .L80241DDC -/* DAF158 80241D58 00000000 */ nop +/* DAF158 80241D58 00000000 */ nop /* DAF15C 80241D5C 0260202D */ daddu $a0, $s3, $zero /* DAF160 80241D60 0280282D */ daddu $a1, $s4, $zero /* DAF164 80241D64 0C090626 */ jal func_80241898_DAEC98 @@ -178,7 +178,7 @@ glabel func_80241AD0_DAEED0 /* DAF16C 80241D6C 8E630070 */ lw $v1, 0x70($s3) /* DAF170 80241D70 2402000F */ addiu $v0, $zero, 0xf /* DAF174 80241D74 14620019 */ bne $v1, $v0, .L80241DDC -/* DAF178 80241D78 00000000 */ nop +/* DAF178 80241D78 00000000 */ nop /* DAF17C 80241D7C 0260202D */ daddu $a0, $s3, $zero /* DAF180 80241D80 0280282D */ daddu $a1, $s4, $zero /* DAF184 80241D84 0C090642 */ jal func_80241908_DAED08 @@ -186,7 +186,7 @@ glabel func_80241AD0_DAEED0 /* DAF18C 80241D8C 8E630070 */ lw $v1, 0x70($s3) /* DAF190 80241D90 24020010 */ addiu $v0, $zero, 0x10 /* DAF194 80241D94 14620011 */ bne $v1, $v0, .L80241DDC -/* DAF198 80241D98 00000000 */ nop +/* DAF198 80241D98 00000000 */ nop /* DAF19C 80241D9C 0260202D */ daddu $a0, $s3, $zero /* DAF1A0 80241DA0 0280282D */ daddu $a1, $s4, $zero /* DAF1A4 80241DA4 0C090676 */ jal func_802419D8_DAEDD8 @@ -194,13 +194,13 @@ glabel func_80241AD0_DAEED0 /* DAF1AC 80241DAC 8E630070 */ lw $v1, 0x70($s3) /* DAF1B0 80241DB0 24020011 */ addiu $v0, $zero, 0x11 /* DAF1B4 80241DB4 14620009 */ bne $v1, $v0, .L80241DDC -/* DAF1B8 80241DB8 00000000 */ nop +/* DAF1B8 80241DB8 00000000 */ nop /* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero /* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero /* DAF1C4 80241DC4 0C09069C */ jal func_80241A70_DAEE70 /* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero /* DAF1CC 80241DCC 08090777 */ j .L80241DDC -/* DAF1D0 80241DD0 00000000 */ nop +/* DAF1D0 80241DD0 00000000 */ nop /* DAF1D4 80241DD4 0C0129CF */ jal func_8004A73C /* DAF1D8 80241DD8 0260202D */ daddu $a0, $s3, $zero .L80241DDC: diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s index 628cdb3330..975358390e 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s @@ -46,7 +46,7 @@ glabel func_80240238_DB24F8 /* DB259C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) /* DB25A0 802402E0 30420004 */ andi $v0, $v0, 4 /* DB25A4 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DB25A8 802402E8 00000000 */ nop +/* DB25A8 802402E8 00000000 */ nop .L802402EC: /* DB25AC 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 /* DB25B0 802402F0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240238_DB24F8 /* DB2670 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) /* DB2674 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) /* DB2678 802403B8 44822000 */ mtc1 $v0, $f4 -/* DB267C 802403BC 00000000 */ nop +/* DB267C 802403BC 00000000 */ nop /* DB2680 802403C0 46802120 */ cvt.s.w $f4, $f4 /* DB2684 802403C4 27A20044 */ addiu $v0, $sp, 0x44 /* DB2688 802403C8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240238_DB24F8 /* DB26A0 802403E0 0C0372DF */ jal func_800DCB7C /* DB26A4 802403E4 27A6003C */ addiu $a2, $sp, 0x3c /* DB26A8 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DB26AC 802403EC 00000000 */ nop +/* DB26AC 802403EC 00000000 */ nop /* DB26B0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DB26B4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) .L802403F8: @@ -128,7 +128,7 @@ glabel func_80240238_DB24F8 /* DB26CC 8024040C 00220821 */ addu $at, $at, $v0 /* DB26D0 80240410 8C2252C0 */ lw $v0, %lo(D_802452C0)($at) /* DB26D4 80240414 00400008 */ jr $v0 -/* DB26D8 80240418 00000000 */ nop +/* DB26D8 80240418 00000000 */ nop /* DB26DC 8024041C 0260202D */ daddu $a0, $s3, $zero /* DB26E0 80240420 0280282D */ daddu $a1, $s4, $zero /* DB26E4 80240424 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240238_DB24F8 /* DB26F4 80240434 0C0125AE */ jal func_800496B8 /* DB26F8 80240438 02A0302D */ daddu $a2, $s5, $zero /* DB26FC 8024043C 08090151 */ j .L80240544 -/* DB2700 80240440 00000000 */ nop +/* DB2700 80240440 00000000 */ nop /* DB2704 80240444 0260202D */ daddu $a0, $s3, $zero /* DB2708 80240448 0280282D */ daddu $a1, $s4, $zero -/* DB270C 8024044C 0C0126D1 */ jal func_80049B44 +/* DB270C 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DB2710 80240450 02A0302D */ daddu $a2, $s5, $zero /* DB2714 80240454 0260202D */ daddu $a0, $s3, $zero /* DB2718 80240458 0280282D */ daddu $a1, $s4, $zero /* DB271C 8024045C 0C012701 */ jal func_80049C04 /* DB2720 80240460 02A0302D */ daddu $a2, $s5, $zero /* DB2724 80240464 08090151 */ j .L80240544 -/* DB2728 80240468 00000000 */ nop +/* DB2728 80240468 00000000 */ nop /* DB272C 8024046C 0260202D */ daddu $a0, $s3, $zero /* DB2730 80240470 0280282D */ daddu $a1, $s4, $zero /* DB2734 80240474 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240238_DB24F8 /* DB2744 80240484 0C0127B3 */ jal func_80049ECC /* DB2748 80240488 02A0302D */ daddu $a2, $s5, $zero /* DB274C 8024048C 08090151 */ j .L80240544 -/* DB2750 80240490 00000000 */ nop +/* DB2750 80240490 00000000 */ nop /* DB2754 80240494 0260202D */ daddu $a0, $s3, $zero /* DB2758 80240498 0280282D */ daddu $a1, $s4, $zero /* DB275C 8024049C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240238_DB24F8 /* DB2774 802404B4 8E630070 */ lw $v1, 0x70($s3) /* DB2778 802404B8 2402000E */ addiu $v0, $zero, 0xe /* DB277C 802404BC 14620021 */ bne $v1, $v0, .L80240544 -/* DB2780 802404C0 00000000 */ nop +/* DB2780 802404C0 00000000 */ nop /* DB2784 802404C4 0260202D */ daddu $a0, $s3, $zero /* DB2788 802404C8 0280282D */ daddu $a1, $s4, $zero /* DB278C 802404CC 0C090000 */ jal func_80240000_DB22C0 @@ -178,7 +178,7 @@ glabel func_80240238_DB24F8 /* DB2794 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DB2798 802404D8 2402000F */ addiu $v0, $zero, 0xf /* DB279C 802404DC 14620019 */ bne $v1, $v0, .L80240544 -/* DB27A0 802404E0 00000000 */ nop +/* DB27A0 802404E0 00000000 */ nop /* DB27A4 802404E4 0260202D */ daddu $a0, $s3, $zero /* DB27A8 802404E8 0280282D */ daddu $a1, $s4, $zero /* DB27AC 802404EC 0C09001C */ jal func_80240070_DB2330 @@ -186,7 +186,7 @@ glabel func_80240238_DB24F8 /* DB27B4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DB27B8 802404F8 24020010 */ addiu $v0, $zero, 0x10 /* DB27BC 802404FC 14620011 */ bne $v1, $v0, .L80240544 -/* DB27C0 80240500 00000000 */ nop +/* DB27C0 80240500 00000000 */ nop /* DB27C4 80240504 0260202D */ daddu $a0, $s3, $zero /* DB27C8 80240508 0280282D */ daddu $a1, $s4, $zero /* DB27CC 8024050C 0C090050 */ jal func_80240140_DB2400 @@ -194,13 +194,13 @@ glabel func_80240238_DB24F8 /* DB27D4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DB27D8 80240518 24020011 */ addiu $v0, $zero, 0x11 /* DB27DC 8024051C 14620009 */ bne $v1, $v0, .L80240544 -/* DB27E0 80240520 00000000 */ nop +/* DB27E0 80240520 00000000 */ nop /* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero /* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero /* DB27EC 8024052C 0C090076 */ jal func_802401D8_DB2498 /* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DB27F4 80240534 08090151 */ j .L80240544 -/* DB27F8 80240538 00000000 */ nop +/* DB27F8 80240538 00000000 */ nop /* DB27FC 8024053C 0C0129CF */ jal func_8004A73C /* DB2800 80240540 0260202D */ daddu $a0, $s3, $zero .L80240544: diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s index 95e5a246ea..d24da2544d 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s @@ -46,7 +46,7 @@ glabel func_80240238_DBD4E8 /* DBD58C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) /* DBD590 802402E0 30420004 */ andi $v0, $v0, 4 /* DBD594 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DBD598 802402E8 00000000 */ nop +/* DBD598 802402E8 00000000 */ nop .L802402EC: /* DBD59C 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 /* DBD5A0 802402F0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240238_DBD4E8 /* DBD660 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) /* DBD664 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) /* DBD668 802403B8 44822000 */ mtc1 $v0, $f4 -/* DBD66C 802403BC 00000000 */ nop +/* DBD66C 802403BC 00000000 */ nop /* DBD670 802403C0 46802120 */ cvt.s.w $f4, $f4 /* DBD674 802403C4 27A20044 */ addiu $v0, $sp, 0x44 /* DBD678 802403C8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240238_DBD4E8 /* DBD690 802403E0 0C0372DF */ jal func_800DCB7C /* DBD694 802403E4 27A6003C */ addiu $a2, $sp, 0x3c /* DBD698 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DBD69C 802403EC 00000000 */ nop +/* DBD69C 802403EC 00000000 */ nop /* DBD6A0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DBD6A4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) .L802403F8: @@ -128,7 +128,7 @@ glabel func_80240238_DBD4E8 /* DBD6BC 8024040C 00220821 */ addu $at, $at, $v0 /* DBD6C0 80240410 8C226BE0 */ lw $v0, %lo(D_80246BE0)($at) /* DBD6C4 80240414 00400008 */ jr $v0 -/* DBD6C8 80240418 00000000 */ nop +/* DBD6C8 80240418 00000000 */ nop /* DBD6CC 8024041C 0260202D */ daddu $a0, $s3, $zero /* DBD6D0 80240420 0280282D */ daddu $a1, $s4, $zero /* DBD6D4 80240424 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240238_DBD4E8 /* DBD6E4 80240434 0C0125AE */ jal func_800496B8 /* DBD6E8 80240438 02A0302D */ daddu $a2, $s5, $zero /* DBD6EC 8024043C 08090151 */ j .L80240544 -/* DBD6F0 80240440 00000000 */ nop +/* DBD6F0 80240440 00000000 */ nop /* DBD6F4 80240444 0260202D */ daddu $a0, $s3, $zero /* DBD6F8 80240448 0280282D */ daddu $a1, $s4, $zero -/* DBD6FC 8024044C 0C0126D1 */ jal func_80049B44 +/* DBD6FC 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DBD700 80240450 02A0302D */ daddu $a2, $s5, $zero /* DBD704 80240454 0260202D */ daddu $a0, $s3, $zero /* DBD708 80240458 0280282D */ daddu $a1, $s4, $zero /* DBD70C 8024045C 0C012701 */ jal func_80049C04 /* DBD710 80240460 02A0302D */ daddu $a2, $s5, $zero /* DBD714 80240464 08090151 */ j .L80240544 -/* DBD718 80240468 00000000 */ nop +/* DBD718 80240468 00000000 */ nop /* DBD71C 8024046C 0260202D */ daddu $a0, $s3, $zero /* DBD720 80240470 0280282D */ daddu $a1, $s4, $zero /* DBD724 80240474 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240238_DBD4E8 /* DBD734 80240484 0C0127B3 */ jal func_80049ECC /* DBD738 80240488 02A0302D */ daddu $a2, $s5, $zero /* DBD73C 8024048C 08090151 */ j .L80240544 -/* DBD740 80240490 00000000 */ nop +/* DBD740 80240490 00000000 */ nop /* DBD744 80240494 0260202D */ daddu $a0, $s3, $zero /* DBD748 80240498 0280282D */ daddu $a1, $s4, $zero /* DBD74C 8024049C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240238_DBD4E8 /* DBD764 802404B4 8E630070 */ lw $v1, 0x70($s3) /* DBD768 802404B8 2402000E */ addiu $v0, $zero, 0xe /* DBD76C 802404BC 14620021 */ bne $v1, $v0, .L80240544 -/* DBD770 802404C0 00000000 */ nop +/* DBD770 802404C0 00000000 */ nop /* DBD774 802404C4 0260202D */ daddu $a0, $s3, $zero /* DBD778 802404C8 0280282D */ daddu $a1, $s4, $zero /* DBD77C 802404CC 0C090000 */ jal func_80240000_DBD2B0 @@ -178,7 +178,7 @@ glabel func_80240238_DBD4E8 /* DBD784 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DBD788 802404D8 2402000F */ addiu $v0, $zero, 0xf /* DBD78C 802404DC 14620019 */ bne $v1, $v0, .L80240544 -/* DBD790 802404E0 00000000 */ nop +/* DBD790 802404E0 00000000 */ nop /* DBD794 802404E4 0260202D */ daddu $a0, $s3, $zero /* DBD798 802404E8 0280282D */ daddu $a1, $s4, $zero /* DBD79C 802404EC 0C09001C */ jal func_80240070_DBD320 @@ -186,7 +186,7 @@ glabel func_80240238_DBD4E8 /* DBD7A4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DBD7A8 802404F8 24020010 */ addiu $v0, $zero, 0x10 /* DBD7AC 802404FC 14620011 */ bne $v1, $v0, .L80240544 -/* DBD7B0 80240500 00000000 */ nop +/* DBD7B0 80240500 00000000 */ nop /* DBD7B4 80240504 0260202D */ daddu $a0, $s3, $zero /* DBD7B8 80240508 0280282D */ daddu $a1, $s4, $zero /* DBD7BC 8024050C 0C090050 */ jal func_80240140_DBD3F0 @@ -194,13 +194,13 @@ glabel func_80240238_DBD4E8 /* DBD7C4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DBD7C8 80240518 24020011 */ addiu $v0, $zero, 0x11 /* DBD7CC 8024051C 14620009 */ bne $v1, $v0, .L80240544 -/* DBD7D0 80240520 00000000 */ nop +/* DBD7D0 80240520 00000000 */ nop /* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero /* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero /* DBD7DC 8024052C 0C090076 */ jal func_802401D8_DBD488 /* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DBD7E4 80240534 08090151 */ j .L80240544 -/* DBD7E8 80240538 00000000 */ nop +/* DBD7E8 80240538 00000000 */ nop /* DBD7EC 8024053C 0C0129CF */ jal func_8004A73C /* DBD7F0 80240540 0260202D */ daddu $a0, $s3, $zero .L80240544: diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242150_DBF400.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242150_DBF400.s deleted file mode 100644 index 381687dded..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242150_DBF400.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242150_DBF400 -/* DBF400 80242150 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DBF404 80242154 AFB3001C */ sw $s3, 0x1c($sp) -/* DBF408 80242158 0080982D */ daddu $s3, $a0, $zero -/* DBF40C 8024215C AFBF0020 */ sw $ra, 0x20($sp) -/* DBF410 80242160 AFB20018 */ sw $s2, 0x18($sp) -/* DBF414 80242164 AFB10014 */ sw $s1, 0x14($sp) -/* DBF418 80242168 AFB00010 */ sw $s0, 0x10($sp) -/* DBF41C 8024216C 8E720148 */ lw $s2, 0x148($s3) -/* DBF420 80242170 86440008 */ lh $a0, 8($s2) -/* DBF424 80242174 0C00EABB */ jal get_npc_unsafe -/* DBF428 80242178 00A0882D */ daddu $s1, $a1, $zero -/* DBF42C 8024217C 8E240008 */ lw $a0, 8($s1) -/* DBF430 80242180 0040802D */ daddu $s0, $v0, $zero -/* DBF434 80242184 00041FC2 */ srl $v1, $a0, 0x1f -/* DBF438 80242188 00832021 */ addu $a0, $a0, $v1 -/* DBF43C 8024218C 00042043 */ sra $a0, $a0, 1 -/* DBF440 80242190 0C00A67F */ jal rand_int -/* DBF444 80242194 24840001 */ addiu $a0, $a0, 1 -/* DBF448 80242198 8E230008 */ lw $v1, 8($s1) -/* DBF44C 8024219C 240400B4 */ addiu $a0, $zero, 0xb4 -/* DBF450 802421A0 00032FC2 */ srl $a1, $v1, 0x1f -/* DBF454 802421A4 00651821 */ addu $v1, $v1, $a1 -/* DBF458 802421A8 00031843 */ sra $v1, $v1, 1 -/* DBF45C 802421AC 00621821 */ addu $v1, $v1, $v0 -/* DBF460 802421B0 0C00A67F */ jal rand_int -/* DBF464 802421B4 A603008E */ sh $v1, 0x8e($s0) -/* DBF468 802421B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* DBF46C 802421BC 44820000 */ mtc1 $v0, $f0 -/* DBF470 802421C0 00000000 */ nop -/* DBF474 802421C4 46800020 */ cvt.s.w $f0, $f0 -/* DBF478 802421C8 46006300 */ add.s $f12, $f12, $f0 -/* DBF47C 802421CC 3C0142B4 */ lui $at, 0x42b4 -/* DBF480 802421D0 44810000 */ mtc1 $at, $f0 -/* DBF484 802421D4 0C00A6C9 */ jal clamp_angle -/* DBF488 802421D8 46006301 */ sub.s $f12, $f12, $f0 -/* DBF48C 802421DC E600000C */ swc1 $f0, 0xc($s0) -/* DBF490 802421E0 8E4200CC */ lw $v0, 0xcc($s2) -/* DBF494 802421E4 8C420000 */ lw $v0, ($v0) -/* DBF498 802421E8 AE020028 */ sw $v0, 0x28($s0) -/* DBF49C 802421EC 24020003 */ addiu $v0, $zero, 3 -/* DBF4A0 802421F0 AE620070 */ sw $v0, 0x70($s3) -/* DBF4A4 802421F4 8FBF0020 */ lw $ra, 0x20($sp) -/* DBF4A8 802421F8 8FB3001C */ lw $s3, 0x1c($sp) -/* DBF4AC 802421FC 8FB20018 */ lw $s2, 0x18($sp) -/* DBF4B0 80242200 8FB10014 */ lw $s1, 0x14($sp) -/* DBF4B4 80242204 8FB00010 */ lw $s0, 0x10($sp) -/* DBF4B8 80242208 03E00008 */ jr $ra -/* DBF4BC 8024220C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index 3772de39ea..f101fdd50f 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -54,7 +54,7 @@ glabel func_80242C84_DBFF34 /* DBFFF4 80242D44 8E4300B0 */ lw $v1, 0xb0($s2) /* DBFFF8 80242D48 30620004 */ andi $v0, $v1, 4 /* DBFFFC 80242D4C 10400007 */ beqz $v0, .L80242D6C -/* DC0000 80242D50 00000000 */ nop +/* DC0000 80242D50 00000000 */ nop /* DC0004 80242D54 824200B4 */ lb $v0, 0xb4($s2) /* DC0008 80242D58 1440003C */ bnez $v0, .L80242E4C /* DC000C 80242D5C 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_80242C84_DBFF34 /* DC0030 80242D80 00220821 */ addu $at, $at, $v0 /* DC0034 80242D84 8C2270C8 */ lw $v0, %lo(D_802470C8)($at) /* DC0038 80242D88 00400008 */ jr $v0 -/* DC003C 80242D8C 00000000 */ nop +/* DC003C 80242D8C 00000000 */ nop /* DC0040 80242D90 0280202D */ daddu $a0, $s4, $zero /* DC0044 80242D94 0200282D */ daddu $a1, $s0, $zero /* DC0048 80242D98 0C09065E */ jal func_80241978_DBEC28 @@ -83,7 +83,7 @@ glabel func_80242C84_DBFF34 /* DC0064 80242DB4 0000102D */ daddu $v0, $zero, $zero /* DC0068 80242DB8 0280202D */ daddu $a0, $s4, $zero /* DC006C 80242DBC 0200282D */ daddu $a1, $s0, $zero -/* DC0070 80242DC0 0C090854 */ jal func_80242150_DBF400 +/* DC0070 80242DC0 0C090854 */ jal dup_omo_07_UnkNpcAIFunc1 /* DC0074 80242DC4 0260302D */ daddu $a2, $s3, $zero /* DC0078 80242DC8 0280202D */ daddu $a0, $s4, $zero /* DC007C 80242DCC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s index 4e62038c1e..69bb1b12c3 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s @@ -46,7 +46,7 @@ glabel func_80240AA8_DC4E78 /* DC4F1C 80240B4C 8E2200B0 */ lw $v0, 0xb0($s1) /* DC4F20 80240B50 30420004 */ andi $v0, $v0, 4 /* DC4F24 80240B54 10400044 */ beqz $v0, .L80240C68 -/* DC4F28 80240B58 00000000 */ nop +/* DC4F28 80240B58 00000000 */ nop .L80240B5C: /* DC4F2C 80240B5C 2404F7FF */ addiu $a0, $zero, -0x801 /* DC4F30 80240B60 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240AA8_DC4E78 /* DC4FF0 80240C20 C640003C */ lwc1 $f0, 0x3c($s2) /* DC4FF4 80240C24 C6420040 */ lwc1 $f2, 0x40($s2) /* DC4FF8 80240C28 44822000 */ mtc1 $v0, $f4 -/* DC4FFC 80240C2C 00000000 */ nop +/* DC4FFC 80240C2C 00000000 */ nop /* DC5000 80240C30 46802120 */ cvt.s.w $f4, $f4 /* DC5004 80240C34 27A20044 */ addiu $v0, $sp, 0x44 /* DC5008 80240C38 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240AA8_DC4E78 /* DC5020 80240C50 0C0372DF */ jal func_800DCB7C /* DC5024 80240C54 27A6003C */ addiu $a2, $sp, 0x3c /* DC5028 80240C58 10400003 */ beqz $v0, .L80240C68 -/* DC502C 80240C5C 00000000 */ nop +/* DC502C 80240C5C 00000000 */ nop /* DC5030 80240C60 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DC5034 80240C64 E640003C */ swc1 $f0, 0x3c($s2) .L80240C68: @@ -128,7 +128,7 @@ glabel func_80240AA8_DC4E78 /* DC504C 80240C7C 00220821 */ addu $at, $at, $v0 /* DC5050 80240C80 8C228770 */ lw $v0, %lo(D_80248770)($at) /* DC5054 80240C84 00400008 */ jr $v0 -/* DC5058 80240C88 00000000 */ nop +/* DC5058 80240C88 00000000 */ nop /* DC505C 80240C8C 0260202D */ daddu $a0, $s3, $zero /* DC5060 80240C90 0280282D */ daddu $a1, $s4, $zero /* DC5064 80240C94 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240AA8_DC4E78 /* DC5074 80240CA4 0C0125AE */ jal func_800496B8 /* DC5078 80240CA8 02A0302D */ daddu $a2, $s5, $zero /* DC507C 80240CAC 0809036D */ j .L80240DB4 -/* DC5080 80240CB0 00000000 */ nop +/* DC5080 80240CB0 00000000 */ nop /* DC5084 80240CB4 0260202D */ daddu $a0, $s3, $zero /* DC5088 80240CB8 0280282D */ daddu $a1, $s4, $zero -/* DC508C 80240CBC 0C0126D1 */ jal func_80049B44 +/* DC508C 80240CBC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DC5090 80240CC0 02A0302D */ daddu $a2, $s5, $zero /* DC5094 80240CC4 0260202D */ daddu $a0, $s3, $zero /* DC5098 80240CC8 0280282D */ daddu $a1, $s4, $zero /* DC509C 80240CCC 0C012701 */ jal func_80049C04 /* DC50A0 80240CD0 02A0302D */ daddu $a2, $s5, $zero /* DC50A4 80240CD4 0809036D */ j .L80240DB4 -/* DC50A8 80240CD8 00000000 */ nop +/* DC50A8 80240CD8 00000000 */ nop /* DC50AC 80240CDC 0260202D */ daddu $a0, $s3, $zero /* DC50B0 80240CE0 0280282D */ daddu $a1, $s4, $zero /* DC50B4 80240CE4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240AA8_DC4E78 /* DC50C4 80240CF4 0C0127B3 */ jal func_80049ECC /* DC50C8 80240CF8 02A0302D */ daddu $a2, $s5, $zero /* DC50CC 80240CFC 0809036D */ j .L80240DB4 -/* DC50D0 80240D00 00000000 */ nop +/* DC50D0 80240D00 00000000 */ nop /* DC50D4 80240D04 0260202D */ daddu $a0, $s3, $zero /* DC50D8 80240D08 0280282D */ daddu $a1, $s4, $zero /* DC50DC 80240D0C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240AA8_DC4E78 /* DC50F4 80240D24 8E630070 */ lw $v1, 0x70($s3) /* DC50F8 80240D28 2402000E */ addiu $v0, $zero, 0xe /* DC50FC 80240D2C 14620021 */ bne $v1, $v0, .L80240DB4 -/* DC5100 80240D30 00000000 */ nop +/* DC5100 80240D30 00000000 */ nop /* DC5104 80240D34 0260202D */ daddu $a0, $s3, $zero /* DC5108 80240D38 0280282D */ daddu $a1, $s4, $zero /* DC510C 80240D3C 0C09021C */ jal func_80240870_DC4C40 @@ -178,7 +178,7 @@ glabel func_80240AA8_DC4E78 /* DC5114 80240D44 8E630070 */ lw $v1, 0x70($s3) /* DC5118 80240D48 2402000F */ addiu $v0, $zero, 0xf /* DC511C 80240D4C 14620019 */ bne $v1, $v0, .L80240DB4 -/* DC5120 80240D50 00000000 */ nop +/* DC5120 80240D50 00000000 */ nop /* DC5124 80240D54 0260202D */ daddu $a0, $s3, $zero /* DC5128 80240D58 0280282D */ daddu $a1, $s4, $zero /* DC512C 80240D5C 0C090238 */ jal func_802408E0_DC4CB0 @@ -186,7 +186,7 @@ glabel func_80240AA8_DC4E78 /* DC5134 80240D64 8E630070 */ lw $v1, 0x70($s3) /* DC5138 80240D68 24020010 */ addiu $v0, $zero, 0x10 /* DC513C 80240D6C 14620011 */ bne $v1, $v0, .L80240DB4 -/* DC5140 80240D70 00000000 */ nop +/* DC5140 80240D70 00000000 */ nop /* DC5144 80240D74 0260202D */ daddu $a0, $s3, $zero /* DC5148 80240D78 0280282D */ daddu $a1, $s4, $zero /* DC514C 80240D7C 0C09026C */ jal func_802409B0_DC4D80 @@ -194,13 +194,13 @@ glabel func_80240AA8_DC4E78 /* DC5154 80240D84 8E630070 */ lw $v1, 0x70($s3) /* DC5158 80240D88 24020011 */ addiu $v0, $zero, 0x11 /* DC515C 80240D8C 14620009 */ bne $v1, $v0, .L80240DB4 -/* DC5160 80240D90 00000000 */ nop +/* DC5160 80240D90 00000000 */ nop /* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero /* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero /* DC516C 80240D9C 0C090292 */ jal func_80240A48_DC4E18 /* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* DC5174 80240DA4 0809036D */ j .L80240DB4 -/* DC5178 80240DA8 00000000 */ nop +/* DC5178 80240DA8 00000000 */ nop /* DC517C 80240DAC 0C0129CF */ jal func_8004A73C /* DC5180 80240DB0 0260202D */ daddu $a0, $s3, $zero .L80240DB4: @@ -214,4 +214,4 @@ glabel func_80240AA8_DC4E78 /* DC51A0 80240DD0 0000102D */ daddu $v0, $zero, $zero /* DC51A4 80240DD4 03E00008 */ jr $ra /* DC51A8 80240DD8 27BD0068 */ addiu $sp, $sp, 0x68 -/* DC51AC 80240DDC 00000000 */ nop +/* DC51AC 80240DDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s index 05e9c993c7..f9640a304a 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s @@ -46,7 +46,7 @@ glabel func_80240C18_DCD8E8 /* DCD98C 80240CBC 8E2200B0 */ lw $v0, 0xb0($s1) /* DCD990 80240CC0 30420004 */ andi $v0, $v0, 4 /* DCD994 80240CC4 10400044 */ beqz $v0, .L80240DD8 -/* DCD998 80240CC8 00000000 */ nop +/* DCD998 80240CC8 00000000 */ nop .L80240CCC: /* DCD99C 80240CCC 2404F7FF */ addiu $a0, $zero, -0x801 /* DCD9A0 80240CD0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240C18_DCD8E8 /* DCDA60 80240D90 C640003C */ lwc1 $f0, 0x3c($s2) /* DCDA64 80240D94 C6420040 */ lwc1 $f2, 0x40($s2) /* DCDA68 80240D98 44822000 */ mtc1 $v0, $f4 -/* DCDA6C 80240D9C 00000000 */ nop +/* DCDA6C 80240D9C 00000000 */ nop /* DCDA70 80240DA0 46802120 */ cvt.s.w $f4, $f4 /* DCDA74 80240DA4 27A20044 */ addiu $v0, $sp, 0x44 /* DCDA78 80240DA8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240C18_DCD8E8 /* DCDA90 80240DC0 0C0372DF */ jal func_800DCB7C /* DCDA94 80240DC4 27A6003C */ addiu $a2, $sp, 0x3c /* DCDA98 80240DC8 10400003 */ beqz $v0, .L80240DD8 -/* DCDA9C 80240DCC 00000000 */ nop +/* DCDA9C 80240DCC 00000000 */ nop /* DCDAA0 80240DD0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DCDAA4 80240DD4 E640003C */ swc1 $f0, 0x3c($s2) .L80240DD8: @@ -128,7 +128,7 @@ glabel func_80240C18_DCD8E8 /* DCDABC 80240DEC 00220821 */ addu $at, $at, $v0 /* DCDAC0 80240DF0 8C22A640 */ lw $v0, %lo(D_8024A640)($at) /* DCDAC4 80240DF4 00400008 */ jr $v0 -/* DCDAC8 80240DF8 00000000 */ nop +/* DCDAC8 80240DF8 00000000 */ nop /* DCDACC 80240DFC 0260202D */ daddu $a0, $s3, $zero /* DCDAD0 80240E00 0280282D */ daddu $a1, $s4, $zero /* DCDAD4 80240E04 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240C18_DCD8E8 /* DCDAE4 80240E14 0C0125AE */ jal func_800496B8 /* DCDAE8 80240E18 02A0302D */ daddu $a2, $s5, $zero /* DCDAEC 80240E1C 080903C9 */ j .L80240F24 -/* DCDAF0 80240E20 00000000 */ nop +/* DCDAF0 80240E20 00000000 */ nop /* DCDAF4 80240E24 0260202D */ daddu $a0, $s3, $zero /* DCDAF8 80240E28 0280282D */ daddu $a1, $s4, $zero -/* DCDAFC 80240E2C 0C0126D1 */ jal func_80049B44 +/* DCDAFC 80240E2C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DCDB00 80240E30 02A0302D */ daddu $a2, $s5, $zero /* DCDB04 80240E34 0260202D */ daddu $a0, $s3, $zero /* DCDB08 80240E38 0280282D */ daddu $a1, $s4, $zero /* DCDB0C 80240E3C 0C012701 */ jal func_80049C04 /* DCDB10 80240E40 02A0302D */ daddu $a2, $s5, $zero /* DCDB14 80240E44 080903C9 */ j .L80240F24 -/* DCDB18 80240E48 00000000 */ nop +/* DCDB18 80240E48 00000000 */ nop /* DCDB1C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* DCDB20 80240E50 0280282D */ daddu $a1, $s4, $zero /* DCDB24 80240E54 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240C18_DCD8E8 /* DCDB34 80240E64 0C0127B3 */ jal func_80049ECC /* DCDB38 80240E68 02A0302D */ daddu $a2, $s5, $zero /* DCDB3C 80240E6C 080903C9 */ j .L80240F24 -/* DCDB40 80240E70 00000000 */ nop +/* DCDB40 80240E70 00000000 */ nop /* DCDB44 80240E74 0260202D */ daddu $a0, $s3, $zero /* DCDB48 80240E78 0280282D */ daddu $a1, $s4, $zero /* DCDB4C 80240E7C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240C18_DCD8E8 /* DCDB64 80240E94 8E630070 */ lw $v1, 0x70($s3) /* DCDB68 80240E98 2402000E */ addiu $v0, $zero, 0xe /* DCDB6C 80240E9C 14620021 */ bne $v1, $v0, .L80240F24 -/* DCDB70 80240EA0 00000000 */ nop +/* DCDB70 80240EA0 00000000 */ nop /* DCDB74 80240EA4 0260202D */ daddu $a0, $s3, $zero /* DCDB78 80240EA8 0280282D */ daddu $a1, $s4, $zero /* DCDB7C 80240EAC 0C090278 */ jal func_802409E0_DCD6B0 @@ -178,7 +178,7 @@ glabel func_80240C18_DCD8E8 /* DCDB84 80240EB4 8E630070 */ lw $v1, 0x70($s3) /* DCDB88 80240EB8 2402000F */ addiu $v0, $zero, 0xf /* DCDB8C 80240EBC 14620019 */ bne $v1, $v0, .L80240F24 -/* DCDB90 80240EC0 00000000 */ nop +/* DCDB90 80240EC0 00000000 */ nop /* DCDB94 80240EC4 0260202D */ daddu $a0, $s3, $zero /* DCDB98 80240EC8 0280282D */ daddu $a1, $s4, $zero /* DCDB9C 80240ECC 0C090294 */ jal func_80240A50_DCD720 @@ -186,7 +186,7 @@ glabel func_80240C18_DCD8E8 /* DCDBA4 80240ED4 8E630070 */ lw $v1, 0x70($s3) /* DCDBA8 80240ED8 24020010 */ addiu $v0, $zero, 0x10 /* DCDBAC 80240EDC 14620011 */ bne $v1, $v0, .L80240F24 -/* DCDBB0 80240EE0 00000000 */ nop +/* DCDBB0 80240EE0 00000000 */ nop /* DCDBB4 80240EE4 0260202D */ daddu $a0, $s3, $zero /* DCDBB8 80240EE8 0280282D */ daddu $a1, $s4, $zero /* DCDBBC 80240EEC 0C0902C8 */ jal func_80240B20_DCD7F0 @@ -194,13 +194,13 @@ glabel func_80240C18_DCD8E8 /* DCDBC4 80240EF4 8E630070 */ lw $v1, 0x70($s3) /* DCDBC8 80240EF8 24020011 */ addiu $v0, $zero, 0x11 /* DCDBCC 80240EFC 14620009 */ bne $v1, $v0, .L80240F24 -/* DCDBD0 80240F00 00000000 */ nop +/* DCDBD0 80240F00 00000000 */ nop /* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero /* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero /* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8_DCD888 /* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero /* DCDBE4 80240F14 080903C9 */ j .L80240F24 -/* DCDBE8 80240F18 00000000 */ nop +/* DCDBE8 80240F18 00000000 */ nop /* DCDBEC 80240F1C 0C0129CF */ jal func_8004A73C /* DCDBF0 80240F20 0260202D */ daddu $a0, $s3, $zero .L80240F24: diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index 6a9500231b..d53d83def5 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -46,7 +46,7 @@ glabel func_8024324C_DCFF1C /* DCFFC0 802432F0 8E4200B0 */ lw $v0, 0xb0($s2) /* DCFFC4 802432F4 30420004 */ andi $v0, $v0, 4 /* DCFFC8 802432F8 1040002F */ beqz $v0, .L802433B8 -/* DCFFCC 802432FC 00000000 */ nop +/* DCFFCC 802432FC 00000000 */ nop .L80243300: /* DCFFD0 80243300 2404F7FF */ addiu $a0, $zero, -0x801 /* DCFFD4 80243304 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_8024324C_DCFF1C /* DD009C 802433CC 00220821 */ addu $at, $at, $v0 /* DD00A0 802433D0 8C22AB38 */ lw $v0, %lo(D_8024AB38)($at) /* DD00A4 802433D4 00400008 */ jr $v0 -/* DD00A8 802433D8 00000000 */ nop +/* DD00A8 802433D8 00000000 */ nop /* DD00AC 802433DC 0260202D */ daddu $a0, $s3, $zero /* DD00B0 802433E0 0200282D */ daddu $a1, $s0, $zero /* DD00B4 802433E4 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_8024324C_DCFF1C /* DD00C4 802433F4 0C0125AE */ jal func_800496B8 /* DD00C8 802433F8 02A0302D */ daddu $a2, $s5, $zero /* DD00CC 802433FC 08090D51 */ j .L80243544 -/* DD00D0 80243400 00000000 */ nop +/* DD00D0 80243400 00000000 */ nop /* DD00D4 80243404 0260202D */ daddu $a0, $s3, $zero /* DD00D8 80243408 0200282D */ daddu $a1, $s0, $zero -/* DD00DC 8024340C 0C0126D1 */ jal func_80049B44 +/* DD00DC 8024340C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DD00E0 80243410 02A0302D */ daddu $a2, $s5, $zero /* DD00E4 80243414 0260202D */ daddu $a0, $s3, $zero /* DD00E8 80243418 0200282D */ daddu $a1, $s0, $zero /* DD00EC 8024341C 0C012701 */ jal func_80049C04 /* DD00F0 80243420 02A0302D */ daddu $a2, $s5, $zero /* DD00F4 80243424 08090D51 */ j .L80243544 -/* DD00F8 80243428 00000000 */ nop +/* DD00F8 80243428 00000000 */ nop /* DD00FC 8024342C 0260202D */ daddu $a0, $s3, $zero /* DD0100 80243430 0200282D */ daddu $a1, $s0, $zero /* DD0104 80243434 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_8024324C_DCFF1C /* DD0114 80243444 0C0127B3 */ jal func_80049ECC /* DD0118 80243448 02A0302D */ daddu $a2, $s5, $zero /* DD011C 8024344C 08090D51 */ j .L80243544 -/* DD0120 80243450 00000000 */ nop +/* DD0120 80243450 00000000 */ nop /* DD0124 80243454 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DD0128 80243458 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* DD012C 8024345C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_8024324C_DCFF1C /* DD0144 80243474 10400008 */ beqz $v0, .L80243498 /* DD0148 80243478 46000086 */ mov.s $f2, $f0 /* DD014C 8024347C 44820000 */ mtc1 $v0, $f0 -/* DD0150 80243480 00000000 */ nop +/* DD0150 80243480 00000000 */ nop /* DD0154 80243484 46800020 */ cvt.s.w $f0, $f0 /* DD0158 80243488 4602003C */ c.lt.s $f0, $f2 -/* DD015C 8024348C 00000000 */ nop +/* DD015C 8024348C 00000000 */ nop /* DD0160 80243490 4500000B */ bc1f .L802434C0 /* DD0164 80243494 0260202D */ daddu $a0, $s3, $zero .L80243498: @@ -164,7 +164,7 @@ glabel func_8024324C_DCFF1C /* DD017C 802434AC 8E630070 */ lw $v1, 0x70($s3) /* DD0180 802434B0 2402000C */ addiu $v0, $zero, 0xc /* DD0184 802434B4 14620023 */ bne $v1, $v0, .L80243544 -/* DD0188 802434B8 00000000 */ nop +/* DD0188 802434B8 00000000 */ nop /* DD018C 802434BC 0260202D */ daddu $a0, $s3, $zero .L802434C0: /* DD0190 802434C0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_8024324C_DCFF1C /* DD01A4 802434D4 0C012849 */ jal func_8004A124 /* DD01A8 802434D8 02A0302D */ daddu $a2, $s5, $zero /* DD01AC 802434DC 08090D51 */ j .L80243544 -/* DD01B0 802434E0 00000000 */ nop +/* DD01B0 802434E0 00000000 */ nop /* DD01B4 802434E4 0260202D */ daddu $a0, $s3, $zero /* DD01B8 802434E8 0200282D */ daddu $a1, $s0, $zero /* DD01BC 802434EC 0C0128FA */ jal func_8004A3E8 /* DD01C0 802434F0 02A0302D */ daddu $a2, $s5, $zero /* DD01C4 802434F4 08090D51 */ j .L80243544 -/* DD01C8 802434F8 00000000 */ nop +/* DD01C8 802434F8 00000000 */ nop /* DD01CC 802434FC 0C0909A3 */ jal func_8024268C_DCF35C /* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero /* DD01D4 80243504 08090D51 */ j .L80243544 -/* DD01D8 80243508 00000000 */ nop +/* DD01D8 80243508 00000000 */ nop /* DD01DC 8024350C 0C0909E3 */ jal omo_09_UnkSetDurationFunc /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero /* DD01E4 80243514 08090D51 */ j .L80243544 -/* DD01E8 80243518 00000000 */ nop +/* DD01E8 80243518 00000000 */ nop /* DD01EC 8024351C 0C0909F4 */ jal omo_09_UnkNpcAIFunc9 /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero /* DD01F4 80243524 08090D51 */ j .L80243544 -/* DD01F8 80243528 00000000 */ nop +/* DD01F8 80243528 00000000 */ nop /* DD01FC 8024352C 0C090A1C */ jal omo_09_UnkDurationCheck /* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero /* DD0204 80243534 08090D51 */ j .L80243544 -/* DD0208 80243538 00000000 */ nop +/* DD0208 80243538 00000000 */ nop /* DD020C 8024353C 0C0129CF */ jal func_8004A73C /* DD0210 80243540 0260202D */ daddu $a0, $s3, $zero .L80243544: diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s index 25b5756840..8660eff67d 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s @@ -46,7 +46,7 @@ glabel func_802404B8_DE2948 /* DE29EC 8024055C 8E2200B0 */ lw $v0, 0xb0($s1) /* DE29F0 80240560 30420004 */ andi $v0, $v0, 4 /* DE29F4 80240564 10400044 */ beqz $v0, .L80240678 -/* DE29F8 80240568 00000000 */ nop +/* DE29F8 80240568 00000000 */ nop .L8024056C: /* DE29FC 8024056C 2404F7FF */ addiu $a0, $zero, -0x801 /* DE2A00 80240570 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_802404B8_DE2948 /* DE2AC0 80240630 C640003C */ lwc1 $f0, 0x3c($s2) /* DE2AC4 80240634 C6420040 */ lwc1 $f2, 0x40($s2) /* DE2AC8 80240638 44822000 */ mtc1 $v0, $f4 -/* DE2ACC 8024063C 00000000 */ nop +/* DE2ACC 8024063C 00000000 */ nop /* DE2AD0 80240640 46802120 */ cvt.s.w $f4, $f4 /* DE2AD4 80240644 27A20044 */ addiu $v0, $sp, 0x44 /* DE2AD8 80240648 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_802404B8_DE2948 /* DE2AF0 80240660 0C0372DF */ jal func_800DCB7C /* DE2AF4 80240664 27A6003C */ addiu $a2, $sp, 0x3c /* DE2AF8 80240668 10400003 */ beqz $v0, .L80240678 -/* DE2AFC 8024066C 00000000 */ nop +/* DE2AFC 8024066C 00000000 */ nop /* DE2B00 80240670 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DE2B04 80240674 E640003C */ swc1 $f0, 0x3c($s2) .L80240678: @@ -128,7 +128,7 @@ glabel func_802404B8_DE2948 /* DE2B1C 8024068C 00220821 */ addu $at, $at, $v0 /* DE2B20 80240690 8C222EF0 */ lw $v0, %lo(D_80242EF0)($at) /* DE2B24 80240694 00400008 */ jr $v0 -/* DE2B28 80240698 00000000 */ nop +/* DE2B28 80240698 00000000 */ nop /* DE2B2C 8024069C 0260202D */ daddu $a0, $s3, $zero /* DE2B30 802406A0 0280282D */ daddu $a1, $s4, $zero /* DE2B34 802406A4 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_802404B8_DE2948 /* DE2B44 802406B4 0C0125AE */ jal func_800496B8 /* DE2B48 802406B8 02A0302D */ daddu $a2, $s5, $zero /* DE2B4C 802406BC 080901F1 */ j .L802407C4 -/* DE2B50 802406C0 00000000 */ nop +/* DE2B50 802406C0 00000000 */ nop /* DE2B54 802406C4 0260202D */ daddu $a0, $s3, $zero /* DE2B58 802406C8 0280282D */ daddu $a1, $s4, $zero -/* DE2B5C 802406CC 0C0126D1 */ jal func_80049B44 +/* DE2B5C 802406CC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DE2B60 802406D0 02A0302D */ daddu $a2, $s5, $zero /* DE2B64 802406D4 0260202D */ daddu $a0, $s3, $zero /* DE2B68 802406D8 0280282D */ daddu $a1, $s4, $zero /* DE2B6C 802406DC 0C012701 */ jal func_80049C04 /* DE2B70 802406E0 02A0302D */ daddu $a2, $s5, $zero /* DE2B74 802406E4 080901F1 */ j .L802407C4 -/* DE2B78 802406E8 00000000 */ nop +/* DE2B78 802406E8 00000000 */ nop /* DE2B7C 802406EC 0260202D */ daddu $a0, $s3, $zero /* DE2B80 802406F0 0280282D */ daddu $a1, $s4, $zero /* DE2B84 802406F4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_802404B8_DE2948 /* DE2B94 80240704 0C0127B3 */ jal func_80049ECC /* DE2B98 80240708 02A0302D */ daddu $a2, $s5, $zero /* DE2B9C 8024070C 080901F1 */ j .L802407C4 -/* DE2BA0 80240710 00000000 */ nop +/* DE2BA0 80240710 00000000 */ nop /* DE2BA4 80240714 0260202D */ daddu $a0, $s3, $zero /* DE2BA8 80240718 0280282D */ daddu $a1, $s4, $zero /* DE2BAC 8024071C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_802404B8_DE2948 /* DE2BC4 80240734 8E630070 */ lw $v1, 0x70($s3) /* DE2BC8 80240738 2402000E */ addiu $v0, $zero, 0xe /* DE2BCC 8024073C 14620021 */ bne $v1, $v0, .L802407C4 -/* DE2BD0 80240740 00000000 */ nop +/* DE2BD0 80240740 00000000 */ nop /* DE2BD4 80240744 0260202D */ daddu $a0, $s3, $zero /* DE2BD8 80240748 0280282D */ daddu $a1, $s4, $zero /* DE2BDC 8024074C 0C0900A0 */ jal func_80240280_DE2710 @@ -178,7 +178,7 @@ glabel func_802404B8_DE2948 /* DE2BE4 80240754 8E630070 */ lw $v1, 0x70($s3) /* DE2BE8 80240758 2402000F */ addiu $v0, $zero, 0xf /* DE2BEC 8024075C 14620019 */ bne $v1, $v0, .L802407C4 -/* DE2BF0 80240760 00000000 */ nop +/* DE2BF0 80240760 00000000 */ nop /* DE2BF4 80240764 0260202D */ daddu $a0, $s3, $zero /* DE2BF8 80240768 0280282D */ daddu $a1, $s4, $zero /* DE2BFC 8024076C 0C0900BC */ jal func_802402F0_DE2780 @@ -186,7 +186,7 @@ glabel func_802404B8_DE2948 /* DE2C04 80240774 8E630070 */ lw $v1, 0x70($s3) /* DE2C08 80240778 24020010 */ addiu $v0, $zero, 0x10 /* DE2C0C 8024077C 14620011 */ bne $v1, $v0, .L802407C4 -/* DE2C10 80240780 00000000 */ nop +/* DE2C10 80240780 00000000 */ nop /* DE2C14 80240784 0260202D */ daddu $a0, $s3, $zero /* DE2C18 80240788 0280282D */ daddu $a1, $s4, $zero /* DE2C1C 8024078C 0C0900F0 */ jal func_802403C0_DE2850 @@ -194,13 +194,13 @@ glabel func_802404B8_DE2948 /* DE2C24 80240794 8E630070 */ lw $v1, 0x70($s3) /* DE2C28 80240798 24020011 */ addiu $v0, $zero, 0x11 /* DE2C2C 8024079C 14620009 */ bne $v1, $v0, .L802407C4 -/* DE2C30 802407A0 00000000 */ nop +/* DE2C30 802407A0 00000000 */ nop /* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero /* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero /* DE2C3C 802407AC 0C090116 */ jal func_80240458_DE28E8 /* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero /* DE2C44 802407B4 080901F1 */ j .L802407C4 -/* DE2C48 802407B8 00000000 */ nop +/* DE2C48 802407B8 00000000 */ nop /* DE2C4C 802407BC 0C0129CF */ jal func_8004A73C /* DE2C50 802407C0 0260202D */ daddu $a0, $s3, $zero .L802407C4: diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s index 91adcf6c4c..3100e65740 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s @@ -46,7 +46,7 @@ glabel func_80240798_DEF638 /* DEF6DC 8024083C 8E2200B0 */ lw $v0, 0xb0($s1) /* DEF6E0 80240840 30420004 */ andi $v0, $v0, 4 /* DEF6E4 80240844 10400044 */ beqz $v0, .L80240958 -/* DEF6E8 80240848 00000000 */ nop +/* DEF6E8 80240848 00000000 */ nop .L8024084C: /* DEF6EC 8024084C 2404F7FF */ addiu $a0, $zero, -0x801 /* DEF6F0 80240850 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240798_DEF638 /* DEF7B0 80240910 C640003C */ lwc1 $f0, 0x3c($s2) /* DEF7B4 80240914 C6420040 */ lwc1 $f2, 0x40($s2) /* DEF7B8 80240918 44822000 */ mtc1 $v0, $f4 -/* DEF7BC 8024091C 00000000 */ nop +/* DEF7BC 8024091C 00000000 */ nop /* DEF7C0 80240920 46802120 */ cvt.s.w $f4, $f4 /* DEF7C4 80240924 27A20044 */ addiu $v0, $sp, 0x44 /* DEF7C8 80240928 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240798_DEF638 /* DEF7E0 80240940 0C0372DF */ jal func_800DCB7C /* DEF7E4 80240944 27A6003C */ addiu $a2, $sp, 0x3c /* DEF7E8 80240948 10400003 */ beqz $v0, .L80240958 -/* DEF7EC 8024094C 00000000 */ nop +/* DEF7EC 8024094C 00000000 */ nop /* DEF7F0 80240950 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DEF7F4 80240954 E640003C */ swc1 $f0, 0x3c($s2) .L80240958: @@ -128,7 +128,7 @@ glabel func_80240798_DEF638 /* DEF80C 8024096C 00220821 */ addu $at, $at, $v0 /* DEF810 80240970 8C227620 */ lw $v0, %lo(D_80247620)($at) /* DEF814 80240974 00400008 */ jr $v0 -/* DEF818 80240978 00000000 */ nop +/* DEF818 80240978 00000000 */ nop /* DEF81C 8024097C 0260202D */ daddu $a0, $s3, $zero /* DEF820 80240980 0280282D */ daddu $a1, $s4, $zero /* DEF824 80240984 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240798_DEF638 /* DEF834 80240994 0C0125AE */ jal func_800496B8 /* DEF838 80240998 02A0302D */ daddu $a2, $s5, $zero /* DEF83C 8024099C 080902A9 */ j .L80240AA4 -/* DEF840 802409A0 00000000 */ nop +/* DEF840 802409A0 00000000 */ nop /* DEF844 802409A4 0260202D */ daddu $a0, $s3, $zero /* DEF848 802409A8 0280282D */ daddu $a1, $s4, $zero -/* DEF84C 802409AC 0C0126D1 */ jal func_80049B44 +/* DEF84C 802409AC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DEF850 802409B0 02A0302D */ daddu $a2, $s5, $zero /* DEF854 802409B4 0260202D */ daddu $a0, $s3, $zero /* DEF858 802409B8 0280282D */ daddu $a1, $s4, $zero /* DEF85C 802409BC 0C012701 */ jal func_80049C04 /* DEF860 802409C0 02A0302D */ daddu $a2, $s5, $zero /* DEF864 802409C4 080902A9 */ j .L80240AA4 -/* DEF868 802409C8 00000000 */ nop +/* DEF868 802409C8 00000000 */ nop /* DEF86C 802409CC 0260202D */ daddu $a0, $s3, $zero /* DEF870 802409D0 0280282D */ daddu $a1, $s4, $zero /* DEF874 802409D4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240798_DEF638 /* DEF884 802409E4 0C0127B3 */ jal func_80049ECC /* DEF888 802409E8 02A0302D */ daddu $a2, $s5, $zero /* DEF88C 802409EC 080902A9 */ j .L80240AA4 -/* DEF890 802409F0 00000000 */ nop +/* DEF890 802409F0 00000000 */ nop /* DEF894 802409F4 0260202D */ daddu $a0, $s3, $zero /* DEF898 802409F8 0280282D */ daddu $a1, $s4, $zero /* DEF89C 802409FC 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240798_DEF638 /* DEF8B4 80240A14 8E630070 */ lw $v1, 0x70($s3) /* DEF8B8 80240A18 2402000E */ addiu $v0, $zero, 0xe /* DEF8BC 80240A1C 14620021 */ bne $v1, $v0, .L80240AA4 -/* DEF8C0 80240A20 00000000 */ nop +/* DEF8C0 80240A20 00000000 */ nop /* DEF8C4 80240A24 0260202D */ daddu $a0, $s3, $zero /* DEF8C8 80240A28 0280282D */ daddu $a1, $s4, $zero /* DEF8CC 80240A2C 0C090158 */ jal func_80240560_DEF400 @@ -178,7 +178,7 @@ glabel func_80240798_DEF638 /* DEF8D4 80240A34 8E630070 */ lw $v1, 0x70($s3) /* DEF8D8 80240A38 2402000F */ addiu $v0, $zero, 0xf /* DEF8DC 80240A3C 14620019 */ bne $v1, $v0, .L80240AA4 -/* DEF8E0 80240A40 00000000 */ nop +/* DEF8E0 80240A40 00000000 */ nop /* DEF8E4 80240A44 0260202D */ daddu $a0, $s3, $zero /* DEF8E8 80240A48 0280282D */ daddu $a1, $s4, $zero /* DEF8EC 80240A4C 0C090174 */ jal func_802405D0_DEF470 @@ -186,7 +186,7 @@ glabel func_80240798_DEF638 /* DEF8F4 80240A54 8E630070 */ lw $v1, 0x70($s3) /* DEF8F8 80240A58 24020010 */ addiu $v0, $zero, 0x10 /* DEF8FC 80240A5C 14620011 */ bne $v1, $v0, .L80240AA4 -/* DEF900 80240A60 00000000 */ nop +/* DEF900 80240A60 00000000 */ nop /* DEF904 80240A64 0260202D */ daddu $a0, $s3, $zero /* DEF908 80240A68 0280282D */ daddu $a1, $s4, $zero /* DEF90C 80240A6C 0C0901A8 */ jal func_802406A0_DEF540 @@ -194,13 +194,13 @@ glabel func_80240798_DEF638 /* DEF914 80240A74 8E630070 */ lw $v1, 0x70($s3) /* DEF918 80240A78 24020011 */ addiu $v0, $zero, 0x11 /* DEF91C 80240A7C 14620009 */ bne $v1, $v0, .L80240AA4 -/* DEF920 80240A80 00000000 */ nop +/* DEF920 80240A80 00000000 */ nop /* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero /* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero /* DEF92C 80240A8C 0C0901CE */ jal func_80240738_DEF5D8 /* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero /* DEF934 80240A94 080902A9 */ j .L80240AA4 -/* DEF938 80240A98 00000000 */ nop +/* DEF938 80240A98 00000000 */ nop /* DEF93C 80240A9C 0C0129CF */ jal func_8004A73C /* DEF940 80240AA0 0260202D */ daddu $a0, $s3, $zero .L80240AA4: diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index c22ca4defd..e056ec8745 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -46,7 +46,7 @@ glabel func_802433A0_DF2240 /* DF22E4 80243444 8E4200B0 */ lw $v0, 0xb0($s2) /* DF22E8 80243448 30420004 */ andi $v0, $v0, 4 /* DF22EC 8024344C 1040002F */ beqz $v0, .L8024350C -/* DF22F0 80243450 00000000 */ nop +/* DF22F0 80243450 00000000 */ nop .L80243454: /* DF22F4 80243454 2404F7FF */ addiu $a0, $zero, -0x801 /* DF22F8 80243458 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_802433A0_DF2240 /* DF23C0 80243520 00220821 */ addu $at, $at, $v0 /* DF23C4 80243524 8C2279D0 */ lw $v0, %lo(D_802479D0)($at) /* DF23C8 80243528 00400008 */ jr $v0 -/* DF23CC 8024352C 00000000 */ nop +/* DF23CC 8024352C 00000000 */ nop /* DF23D0 80243530 0260202D */ daddu $a0, $s3, $zero /* DF23D4 80243534 0200282D */ daddu $a1, $s0, $zero /* DF23D8 80243538 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_802433A0_DF2240 /* DF23E8 80243548 0C0125AE */ jal func_800496B8 /* DF23EC 8024354C 02A0302D */ daddu $a2, $s5, $zero /* DF23F0 80243550 08090DA6 */ j .L80243698 -/* DF23F4 80243554 00000000 */ nop +/* DF23F4 80243554 00000000 */ nop /* DF23F8 80243558 0260202D */ daddu $a0, $s3, $zero /* DF23FC 8024355C 0200282D */ daddu $a1, $s0, $zero -/* DF2400 80243560 0C0126D1 */ jal func_80049B44 +/* DF2400 80243560 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DF2404 80243564 02A0302D */ daddu $a2, $s5, $zero /* DF2408 80243568 0260202D */ daddu $a0, $s3, $zero /* DF240C 8024356C 0200282D */ daddu $a1, $s0, $zero /* DF2410 80243570 0C012701 */ jal func_80049C04 /* DF2414 80243574 02A0302D */ daddu $a2, $s5, $zero /* DF2418 80243578 08090DA6 */ j .L80243698 -/* DF241C 8024357C 00000000 */ nop +/* DF241C 8024357C 00000000 */ nop /* DF2420 80243580 0260202D */ daddu $a0, $s3, $zero /* DF2424 80243584 0200282D */ daddu $a1, $s0, $zero /* DF2428 80243588 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_802433A0_DF2240 /* DF2438 80243598 0C0127B3 */ jal func_80049ECC /* DF243C 8024359C 02A0302D */ daddu $a2, $s5, $zero /* DF2440 802435A0 08090DA6 */ j .L80243698 -/* DF2444 802435A4 00000000 */ nop +/* DF2444 802435A4 00000000 */ nop /* DF2448 802435A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DF244C 802435AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* DF2450 802435B0 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_802433A0_DF2240 /* DF2468 802435C8 10400008 */ beqz $v0, .L802435EC /* DF246C 802435CC 46000086 */ mov.s $f2, $f0 /* DF2470 802435D0 44820000 */ mtc1 $v0, $f0 -/* DF2474 802435D4 00000000 */ nop +/* DF2474 802435D4 00000000 */ nop /* DF2478 802435D8 46800020 */ cvt.s.w $f0, $f0 /* DF247C 802435DC 4602003C */ c.lt.s $f0, $f2 -/* DF2480 802435E0 00000000 */ nop +/* DF2480 802435E0 00000000 */ nop /* DF2484 802435E4 4500000B */ bc1f .L80243614 /* DF2488 802435E8 0260202D */ daddu $a0, $s3, $zero .L802435EC: @@ -164,7 +164,7 @@ glabel func_802433A0_DF2240 /* DF24A0 80243600 8E630070 */ lw $v1, 0x70($s3) /* DF24A4 80243604 2402000C */ addiu $v0, $zero, 0xc /* DF24A8 80243608 14620023 */ bne $v1, $v0, .L80243698 -/* DF24AC 8024360C 00000000 */ nop +/* DF24AC 8024360C 00000000 */ nop /* DF24B0 80243610 0260202D */ daddu $a0, $s3, $zero .L80243614: /* DF24B4 80243614 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_802433A0_DF2240 /* DF24C8 80243628 0C012849 */ jal func_8004A124 /* DF24CC 8024362C 02A0302D */ daddu $a2, $s5, $zero /* DF24D0 80243630 08090DA6 */ j .L80243698 -/* DF24D4 80243634 00000000 */ nop +/* DF24D4 80243634 00000000 */ nop /* DF24D8 80243638 0260202D */ daddu $a0, $s3, $zero /* DF24DC 8024363C 0200282D */ daddu $a1, $s0, $zero /* DF24E0 80243640 0C0128FA */ jal func_8004A3E8 /* DF24E4 80243644 02A0302D */ daddu $a2, $s5, $zero /* DF24E8 80243648 08090DA6 */ j .L80243698 -/* DF24EC 8024364C 00000000 */ nop +/* DF24EC 8024364C 00000000 */ nop /* DF24F0 80243650 0C0909F8 */ jal func_802427E0_DF1680 /* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero /* DF24F8 80243658 08090DA6 */ j .L80243698 -/* DF24FC 8024365C 00000000 */ nop +/* DF24FC 8024365C 00000000 */ nop /* DF2500 80243660 0C090A38 */ jal omo_17_UnkSetDurationFunc /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero /* DF2508 80243668 08090DA6 */ j .L80243698 -/* DF250C 8024366C 00000000 */ nop +/* DF250C 8024366C 00000000 */ nop /* DF2510 80243670 0C090A49 */ jal omo_17_UnkNpcAIFunc9 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero /* DF2518 80243678 08090DA6 */ j .L80243698 -/* DF251C 8024367C 00000000 */ nop +/* DF251C 8024367C 00000000 */ nop /* DF2520 80243680 0C090A71 */ jal omo_17_UnkDurationCheck /* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero /* DF2528 80243688 08090DA6 */ j .L80243698 -/* DF252C 8024368C 00000000 */ nop +/* DF252C 8024368C 00000000 */ nop /* DF2530 80243690 0C0129CF */ jal func_8004A73C /* DF2534 80243694 0260202D */ daddu $a0, $s3, $zero .L80243698: diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s index e89faacd16..5f7b82026d 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -117,7 +117,7 @@ glabel func_80242698_D8F8E8 /* D8FA90 80242840 00000000 */ nop /* D8FA94 80242844 0240202D */ daddu $a0, $s2, $zero /* D8FA98 80242848 0260282D */ daddu $a1, $s3, $zero -/* D8FA9C 8024284C 0C0126D1 */ jal func_80049B44 +/* D8FA9C 8024284C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D8FAA0 80242850 0280302D */ daddu $a2, $s4, $zero /* D8FAA4 80242854 0240202D */ daddu $a0, $s2, $zero /* D8FAA8 80242858 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s index ed41af7f65..147187671f 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -117,7 +117,7 @@ glabel func_8024156C_D944AC /* D94654 80241714 00000000 */ nop /* D94658 80241718 0240202D */ daddu $a0, $s2, $zero /* D9465C 8024171C 0260282D */ daddu $a1, $s3, $zero -/* D94660 80241720 0C0126D1 */ jal func_80049B44 +/* D94660 80241720 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D94664 80241724 0280302D */ daddu $a2, $s4, $zero /* D94668 80241728 0240202D */ daddu $a0, $s2, $zero /* D9466C 8024172C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_8024023C_D0596C.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_8024023C_D0596C.s deleted file mode 100644 index e723b679f9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_8024023C_D0596C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_D0596C -/* D0596C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D05970 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* D05974 80240244 0080802D */ daddu $s0, $a0, $zero -/* D05978 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* D0597C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* D05980 80240250 8E02000C */ lw $v0, 0xc($s0) -/* D05984 80240254 0C0B210B */ jal get_float_variable -/* D05988 80240258 8C450000 */ lw $a1, ($v0) -/* D0598C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* D05990 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D05994 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D05998 80240268 44060000 */ mfc1 $a2, $f0 -/* D0599C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* D059A0 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* D059A4 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* D059A8 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* D059AC 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* D059B0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* D059B4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* D059B8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* D059BC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* D059C0 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* D059C4 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* D059C8 80240298 0C0B2190 */ jal set_float_variable -/* D059CC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D059D0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* D059D4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* D059D8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* D059DC 802402AC 0C0B2190 */ jal set_float_variable -/* D059E0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D059E4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* D059E8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* D059EC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* D059F0 802402C0 0C0B2190 */ jal set_float_variable -/* D059F4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D059F8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* D059FC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* D05A00 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D05A04 802402D4 24020002 */ addiu $v0, $zero, 2 -/* D05A08 802402D8 03E00008 */ jr $ra -/* D05A0C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s index 155acae39a..8e6611b3c7 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -117,7 +117,7 @@ glabel func_8024066C_D1172C /* D118D4 80240814 00000000 */ nop /* D118D8 80240818 0240202D */ daddu $a0, $s2, $zero /* D118DC 8024081C 0260282D */ daddu $a1, $s3, $zero -/* D118E0 80240820 0C0126D1 */ jal func_80049B44 +/* D118E0 80240820 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D118E4 80240824 0280302D */ daddu $a2, $s4, $zero /* D118E8 80240828 0240202D */ daddu $a0, $s2, $zero /* D118EC 8024082C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s index fe1ca41cf3..62c9a72cd2 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -117,7 +117,7 @@ glabel func_8024061C_D18DFC /* D18FA4 802407C4 00000000 */ nop /* D18FA8 802407C8 0240202D */ daddu $a0, $s2, $zero /* D18FAC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* D18FB0 802407D0 0C0126D1 */ jal func_80049B44 +/* D18FB0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D18FB4 802407D4 0280302D */ daddu $a2, $s4, $zero /* D18FB8 802407D8 0240202D */ daddu $a0, $s2, $zero /* D18FBC 802407DC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s index 1af9f8916d..19347d235e 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -117,7 +117,7 @@ glabel func_80240C6C_D2C99C /* D2CB44 80240E14 00000000 */ nop /* D2CB48 80240E18 0240202D */ daddu $a0, $s2, $zero /* D2CB4C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* D2CB50 80240E20 0C0126D1 */ jal func_80049B44 +/* D2CB50 80240E20 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D2CB54 80240E24 0280302D */ daddu $a2, $s4, $zero /* D2CB58 80240E28 0240202D */ daddu $a0, $s2, $zero /* D2CB5C 80240E2C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s index 99a5ed8f27..5e775f29db 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -117,7 +117,7 @@ glabel func_8024135C_D30FDC /* D31184 80241504 00000000 */ nop /* D31188 80241508 0240202D */ daddu $a0, $s2, $zero /* D3118C 8024150C 0260282D */ daddu $a1, $s3, $zero -/* D31190 80241510 0C0126D1 */ jal func_80049B44 +/* D31190 80241510 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D31194 80241514 0280302D */ daddu $a2, $s4, $zero /* D31198 80241518 0240202D */ daddu $a0, $s2, $zero /* D3119C 8024151C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s index 7862ea75b4..ae999a71d0 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -117,7 +117,7 @@ glabel func_802409EC_D381EC /* D38394 80240B94 00000000 */ nop /* D38398 80240B98 0240202D */ daddu $a0, $s2, $zero /* D3839C 80240B9C 0260282D */ daddu $a1, $s3, $zero -/* D383A0 80240BA0 0C0126D1 */ jal func_80049B44 +/* D383A0 80240BA0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D383A4 80240BA4 0280302D */ daddu $a2, $s4, $zero /* D383A8 80240BA8 0240202D */ daddu $a0, $s2, $zero /* D383AC 80240BAC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548_8699F8.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548_8699F8.s deleted file mode 100644 index fcf0b5602a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548_8699F8.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548_8699F8 -/* 8699F8 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8699FC 8024054C AFB00018 */ sw $s0, 0x18($sp) -/* 869A00 80240550 0080802D */ daddu $s0, $a0, $zero -/* 869A04 80240554 AFBF001C */ sw $ra, 0x1c($sp) -/* 869A08 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 869A0C 8024055C 8E02000C */ lw $v0, 0xc($s0) -/* 869A10 80240560 0C0B210B */ jal get_float_variable -/* 869A14 80240564 8C450000 */ lw $a1, ($v0) -/* 869A18 80240568 27A40010 */ addiu $a0, $sp, 0x10 -/* 869A1C 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 869A20 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 869A24 80240574 44060000 */ mfc1 $a2, $f0 -/* 869A28 80240578 C4400028 */ lwc1 $f0, 0x28($v0) -/* 869A2C 8024057C C4420030 */ lwc1 $f2, 0x30($v0) -/* 869A30 80240580 E7A00010 */ swc1 $f0, 0x10($sp) -/* 869A34 80240584 E7A20014 */ swc1 $f2, 0x14($sp) -/* 869A38 80240588 8C470080 */ lw $a3, 0x80($v0) -/* 869A3C 8024058C C454002C */ lwc1 $f20, 0x2c($v0) -/* 869A40 80240590 0C00A7E7 */ jal add_vec2D_polar -/* 869A44 80240594 27A50014 */ addiu $a1, $sp, 0x14 -/* 869A48 80240598 0200202D */ daddu $a0, $s0, $zero -/* 869A4C 8024059C 3C05FE36 */ lui $a1, 0xfe36 -/* 869A50 802405A0 8FA60010 */ lw $a2, 0x10($sp) -/* 869A54 802405A4 0C0B2190 */ jal set_float_variable -/* 869A58 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 869A5C 802405AC 0200202D */ daddu $a0, $s0, $zero -/* 869A60 802405B0 3C05FE36 */ lui $a1, 0xfe36 -/* 869A64 802405B4 4406A000 */ mfc1 $a2, $f20 -/* 869A68 802405B8 0C0B2190 */ jal set_float_variable -/* 869A6C 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 869A70 802405C0 0200202D */ daddu $a0, $s0, $zero -/* 869A74 802405C4 3C05FE36 */ lui $a1, 0xfe36 -/* 869A78 802405C8 8FA60014 */ lw $a2, 0x14($sp) -/* 869A7C 802405CC 0C0B2190 */ jal set_float_variable -/* 869A80 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 869A84 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 869A88 802405D8 8FB00018 */ lw $s0, 0x18($sp) -/* 869A8C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 869A90 802405E0 24020002 */ addiu $v0, $zero, 2 -/* 869A94 802405E4 03E00008 */ jr $ra -/* 869A98 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 869A9C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_8024023C_86ED3C.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_8024023C_86ED3C.s deleted file mode 100644 index f4b2c4a379..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_8024023C_86ED3C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_86ED3C -/* 86ED3C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 86ED40 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 86ED44 80240244 0080802D */ daddu $s0, $a0, $zero -/* 86ED48 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 86ED4C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 86ED50 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 86ED54 80240254 0C0B210B */ jal get_float_variable -/* 86ED58 80240258 8C450000 */ lw $a1, ($v0) -/* 86ED5C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 86ED60 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 86ED64 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 86ED68 80240268 44060000 */ mfc1 $a2, $f0 -/* 86ED6C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 86ED70 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 86ED74 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 86ED78 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 86ED7C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 86ED80 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 86ED84 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 86ED88 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 86ED8C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 86ED90 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 86ED94 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 86ED98 80240298 0C0B2190 */ jal set_float_variable -/* 86ED9C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 86EDA0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 86EDA4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 86EDA8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 86EDAC 802402AC 0C0B2190 */ jal set_float_variable -/* 86EDB0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 86EDB4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 86EDB8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 86EDBC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 86EDC0 802402C0 0C0B2190 */ jal set_float_variable -/* 86EDC4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 86EDC8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 86EDCC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 86EDD0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 86EDD4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 86EDD8 802402D8 03E00008 */ jr $ra -/* 86EDDC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240548_871F78.s b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240548_871F78.s deleted file mode 100644 index 69d8b0dfc8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240548_871F78.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548_871F78 -/* 871F78 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 871F7C 8024054C AFB00018 */ sw $s0, 0x18($sp) -/* 871F80 80240550 0080802D */ daddu $s0, $a0, $zero -/* 871F84 80240554 AFBF001C */ sw $ra, 0x1c($sp) -/* 871F88 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 871F8C 8024055C 8E02000C */ lw $v0, 0xc($s0) -/* 871F90 80240560 0C0B210B */ jal get_float_variable -/* 871F94 80240564 8C450000 */ lw $a1, ($v0) -/* 871F98 80240568 27A40010 */ addiu $a0, $sp, 0x10 -/* 871F9C 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 871FA0 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 871FA4 80240574 44060000 */ mfc1 $a2, $f0 -/* 871FA8 80240578 C4400028 */ lwc1 $f0, 0x28($v0) -/* 871FAC 8024057C C4420030 */ lwc1 $f2, 0x30($v0) -/* 871FB0 80240580 E7A00010 */ swc1 $f0, 0x10($sp) -/* 871FB4 80240584 E7A20014 */ swc1 $f2, 0x14($sp) -/* 871FB8 80240588 8C470080 */ lw $a3, 0x80($v0) -/* 871FBC 8024058C C454002C */ lwc1 $f20, 0x2c($v0) -/* 871FC0 80240590 0C00A7E7 */ jal add_vec2D_polar -/* 871FC4 80240594 27A50014 */ addiu $a1, $sp, 0x14 -/* 871FC8 80240598 0200202D */ daddu $a0, $s0, $zero -/* 871FCC 8024059C 3C05FE36 */ lui $a1, 0xfe36 -/* 871FD0 802405A0 8FA60010 */ lw $a2, 0x10($sp) -/* 871FD4 802405A4 0C0B2190 */ jal set_float_variable -/* 871FD8 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 871FDC 802405AC 0200202D */ daddu $a0, $s0, $zero -/* 871FE0 802405B0 3C05FE36 */ lui $a1, 0xfe36 -/* 871FE4 802405B4 4406A000 */ mfc1 $a2, $f20 -/* 871FE8 802405B8 0C0B2190 */ jal set_float_variable -/* 871FEC 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 871FF0 802405C0 0200202D */ daddu $a0, $s0, $zero -/* 871FF4 802405C4 3C05FE36 */ lui $a1, 0xfe36 -/* 871FF8 802405C8 8FA60014 */ lw $a2, 0x14($sp) -/* 871FFC 802405CC 0C0B2190 */ jal set_float_variable -/* 872000 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 872004 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 872008 802405D8 8FB00018 */ lw $s0, 0x18($sp) -/* 87200C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 872010 802405E0 24020002 */ addiu $v0, $zero, 2 -/* 872014 802405E4 03E00008 */ jr $ra -/* 872018 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 87201C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_8024023C_87711C.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_8024023C_87711C.s deleted file mode 100644 index e5c56a59c7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_8024023C_87711C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_87711C -/* 87711C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 877120 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 877124 80240244 0080802D */ daddu $s0, $a0, $zero -/* 877128 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 87712C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 877130 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 877134 80240254 0C0B210B */ jal get_float_variable -/* 877138 80240258 8C450000 */ lw $a1, ($v0) -/* 87713C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 877140 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 877144 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 877148 80240268 44060000 */ mfc1 $a2, $f0 -/* 87714C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 877150 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 877154 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 877158 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 87715C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 877160 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 877164 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 877168 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 87716C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 877170 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 877174 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 877178 80240298 0C0B2190 */ jal set_float_variable -/* 87717C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 877180 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 877184 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 877188 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 87718C 802402AC 0C0B2190 */ jal set_float_variable -/* 877190 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 877194 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 877198 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 87719C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 8771A0 802402C0 0C0B2190 */ jal set_float_variable -/* 8771A4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8771A8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8771AC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8771B0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8771B4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 8771B8 802402D8 03E00008 */ jr $ra -/* 8771BC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024023C_879E1C.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024023C_879E1C.s deleted file mode 100644 index c35786ab9c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024023C_879E1C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_879E1C -/* 879E1C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 879E20 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 879E24 80240244 0080802D */ daddu $s0, $a0, $zero -/* 879E28 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 879E2C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 879E30 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 879E34 80240254 0C0B210B */ jal get_float_variable -/* 879E38 80240258 8C450000 */ lw $a1, ($v0) -/* 879E3C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 879E40 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 879E44 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 879E48 80240268 44060000 */ mfc1 $a2, $f0 -/* 879E4C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 879E50 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 879E54 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 879E58 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 879E5C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 879E60 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 879E64 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 879E68 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 879E6C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 879E70 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 879E74 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 879E78 80240298 0C0B2190 */ jal set_float_variable -/* 879E7C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 879E80 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 879E84 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 879E88 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 879E8C 802402AC 0C0B2190 */ jal set_float_variable -/* 879E90 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 879E94 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 879E98 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 879E9C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 879EA0 802402C0 0C0B2190 */ jal set_float_variable -/* 879EA4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 879EA8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 879EAC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 879EB0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 879EB4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 879EB8 802402D8 03E00008 */ jr $ra -/* 879EBC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_8024023C_87F02C.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_8024023C_87F02C.s deleted file mode 100644 index fcdc328cf9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_8024023C_87F02C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_87F02C -/* 87F02C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87F030 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 87F034 80240244 0080802D */ daddu $s0, $a0, $zero -/* 87F038 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 87F03C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 87F040 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 87F044 80240254 0C0B210B */ jal get_float_variable -/* 87F048 80240258 8C450000 */ lw $a1, ($v0) -/* 87F04C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 87F050 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 87F054 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 87F058 80240268 44060000 */ mfc1 $a2, $f0 -/* 87F05C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 87F060 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 87F064 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87F068 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 87F06C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 87F070 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 87F074 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 87F078 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 87F07C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 87F080 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 87F084 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 87F088 80240298 0C0B2190 */ jal set_float_variable -/* 87F08C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 87F090 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 87F094 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 87F098 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 87F09C 802402AC 0C0B2190 */ jal set_float_variable -/* 87F0A0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 87F0A4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 87F0A8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 87F0AC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 87F0B0 802402C0 0C0B2190 */ jal set_float_variable -/* 87F0B4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 87F0B8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 87F0BC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 87F0C0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 87F0C4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 87F0C8 802402D8 03E00008 */ jr $ra -/* 87F0CC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_8024023C_8823FC.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_8024023C_8823FC.s deleted file mode 100644 index 7bb4a56672..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_8024023C_8823FC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8823FC -/* 8823FC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 882400 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 882404 80240244 0080802D */ daddu $s0, $a0, $zero -/* 882408 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 88240C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 882410 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 882414 80240254 0C0B210B */ jal get_float_variable -/* 882418 80240258 8C450000 */ lw $a1, ($v0) -/* 88241C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 882420 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 882424 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 882428 80240268 44060000 */ mfc1 $a2, $f0 -/* 88242C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 882430 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 882434 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 882438 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 88243C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 882440 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 882444 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 882448 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 88244C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 882450 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 882454 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 882458 80240298 0C0B2190 */ jal set_float_variable -/* 88245C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 882460 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 882464 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 882468 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 88246C 802402AC 0C0B2190 */ jal set_float_variable -/* 882470 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 882474 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 882478 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 88247C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 882480 802402C0 0C0B2190 */ jal set_float_variable -/* 882484 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 882488 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 88248C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 882490 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 882494 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 882498 802402D8 03E00008 */ jr $ra -/* 88249C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s index ff9eaba6cd..06f94dd037 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s @@ -55,7 +55,7 @@ glabel func_80240DC4_882F84 /* 883048 80240E88 8E2200B0 */ lw $v0, 0xb0($s1) /* 88304C 80240E8C 30420004 */ andi $v0, $v0, 4 /* 883050 80240E90 10400047 */ beqz $v0, .L80240FB0 -/* 883054 80240E94 00000000 */ nop +/* 883054 80240E94 00000000 */ nop .L80240E98: /* 883058 80240E98 AE600070 */ sw $zero, 0x70($s3) /* 88305C 80240E9C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240DC4_882F84 /* 883100 80240F40 24020028 */ addiu $v0, $zero, 0x28 /* 883104 80240F44 AFA2001C */ sw $v0, 0x1c($sp) /* 883108 80240F48 44833000 */ mtc1 $v1, $f6 -/* 88310C 80240F4C 00000000 */ nop +/* 88310C 80240F4C 00000000 */ nop /* 883110 80240F50 468031A0 */ cvt.s.w $f6, $f6 /* 883114 80240F54 44073000 */ mfc1 $a3, $f6 /* 883118 80240F58 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240DC4_882F84 /* 8831D0 80241010 10600015 */ beqz $v1, .L80241068 /* 8831D4 80241014 0260202D */ daddu $a0, $s3, $zero /* 8831D8 80241018 0809045C */ j .L80241170 -/* 8831DC 8024101C 00000000 */ nop +/* 8831DC 8024101C 00000000 */ nop .L80241020: /* 8831E0 80241020 1062001C */ beq $v1, $v0, .L80241094 /* 8831E4 80241024 24020003 */ addiu $v0, $zero, 3 /* 8831E8 80241028 10620035 */ beq $v1, $v0, .L80241100 /* 8831EC 8024102C 0260202D */ daddu $a0, $s3, $zero /* 8831F0 80241030 0809045C */ j .L80241170 -/* 8831F4 80241034 00000000 */ nop +/* 8831F4 80241034 00000000 */ nop .L80241038: /* 8831F8 80241038 2402000E */ addiu $v0, $zero, 0xe /* 8831FC 8024103C 1062003F */ beq $v1, $v0, .L8024113C @@ -177,9 +177,9 @@ glabel func_80240DC4_882F84 /* 883210 80241050 10620040 */ beq $v1, $v0, .L80241154 /* 883214 80241054 24020063 */ addiu $v0, $zero, 0x63 /* 883218 80241058 10620043 */ beq $v1, $v0, .L80241168 -/* 88321C 8024105C 00000000 */ nop +/* 88321C 8024105C 00000000 */ nop /* 883220 80241060 0809045C */ j .L80241170 -/* 883224 80241064 00000000 */ nop +/* 883224 80241064 00000000 */ nop .L80241068: /* 883228 80241068 0280282D */ daddu $a1, $s4, $zero /* 88322C 8024106C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240DC4_882F84 /* 883244 80241084 0C0125AE */ jal func_800496B8 /* 883248 80241088 02A0302D */ daddu $a2, $s5, $zero /* 88324C 8024108C 0809045C */ j .L80241170 -/* 883250 80241090 00000000 */ nop +/* 883250 80241090 00000000 */ nop .L80241094: /* 883254 80241094 0260202D */ daddu $a0, $s3, $zero /* 883258 80241098 0280282D */ daddu $a1, $s4, $zero -/* 88325C 8024109C 0C0126D1 */ jal func_80049B44 +/* 88325C 8024109C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 883260 802410A0 02A0302D */ daddu $a2, $s5, $zero /* 883264 802410A4 8E230088 */ lw $v1, 0x88($s1) /* 883268 802410A8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240DC4_882F84 /* 8832C4 80241104 0C012701 */ jal func_80049C04 /* 8832C8 80241108 02A0302D */ daddu $a2, $s5, $zero /* 8832CC 8024110C 0809045C */ j .L80241170 -/* 8832D0 80241110 00000000 */ nop +/* 8832D0 80241110 00000000 */ nop .L80241114: /* 8832D4 80241114 0260202D */ daddu $a0, $s3, $zero /* 8832D8 80241118 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240DC4_882F84 /* 8832EC 8024112C 0C0902AB */ jal func_80240AAC_882C6C /* 8832F0 80241130 02A0302D */ daddu $a2, $s5, $zero /* 8832F4 80241134 0809045C */ j .L80241170 -/* 8832F8 80241138 00000000 */ nop +/* 8832F8 80241138 00000000 */ nop .L8024113C: /* 8832FC 8024113C 0260202D */ daddu $a0, $s3, $zero /* 883300 80241140 0280282D */ daddu $a1, $s4, $zero /* 883304 80241144 0C0902F8 */ jal func_80240BE0_882DA0 /* 883308 80241148 02A0302D */ daddu $a2, $s5, $zero /* 88330C 8024114C 0809045C */ j .L80241170 -/* 883310 80241150 00000000 */ nop +/* 883310 80241150 00000000 */ nop .L80241154: /* 883314 80241154 0280282D */ daddu $a1, $s4, $zero /* 883318 80241158 0C090351 */ jal func_80240D44_882F04 /* 88331C 8024115C 02A0302D */ daddu $a2, $s5, $zero /* 883320 80241160 0809045C */ j .L80241170 -/* 883324 80241164 00000000 */ nop +/* 883324 80241164 00000000 */ nop .L80241168: /* 883328 80241168 0C0129CF */ jal func_8004A73C /* 88332C 8024116C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240DC4_882F84 /* 883380 802411C0 00220821 */ addu $at, $at, $v0 /* 883384 802411C4 8C2241A8 */ lw $v0, %lo(D_802441A8)($at) /* 883388 802411C8 00400008 */ jr $v0 -/* 88338C 802411CC 00000000 */ nop +/* 88338C 802411CC 00000000 */ nop /* 883390 802411D0 8E420028 */ lw $v0, 0x28($s2) /* 883394 802411D4 24420001 */ addiu $v0, $v0, 1 /* 883398 802411D8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_8024023C_888E0C.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_8024023C_888E0C.s deleted file mode 100644 index 739574b720..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_8024023C_888E0C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_888E0C -/* 888E0C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 888E10 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 888E14 80240244 0080802D */ daddu $s0, $a0, $zero -/* 888E18 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 888E1C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 888E20 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 888E24 80240254 0C0B210B */ jal get_float_variable -/* 888E28 80240258 8C450000 */ lw $a1, ($v0) -/* 888E2C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 888E30 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 888E34 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 888E38 80240268 44060000 */ mfc1 $a2, $f0 -/* 888E3C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 888E40 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 888E44 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 888E48 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 888E4C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 888E50 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 888E54 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 888E58 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 888E5C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 888E60 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 888E64 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 888E68 80240298 0C0B2190 */ jal set_float_variable -/* 888E6C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 888E70 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 888E74 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 888E78 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 888E7C 802402AC 0C0B2190 */ jal set_float_variable -/* 888E80 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 888E84 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 888E88 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 888E8C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 888E90 802402C0 0C0B2190 */ jal set_float_variable -/* 888E94 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 888E98 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 888E9C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 888EA0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 888EA4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 888EA8 802402D8 03E00008 */ jr $ra -/* 888EAC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s index d41e2091a4..2b13b53c9f 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -55,7 +55,7 @@ glabel func_80241CF4_88A8C4 /* 88A988 80241DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 88A98C 80241DBC 30420004 */ andi $v0, $v0, 4 /* 88A990 80241DC0 10400047 */ beqz $v0, .L80241EE0 -/* 88A994 80241DC4 00000000 */ nop +/* 88A994 80241DC4 00000000 */ nop .L80241DC8: /* 88A998 80241DC8 AE600070 */ sw $zero, 0x70($s3) /* 88A99C 80241DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80241CF4_88A8C4 /* 88AA40 80241E70 24020028 */ addiu $v0, $zero, 0x28 /* 88AA44 80241E74 AFA2001C */ sw $v0, 0x1c($sp) /* 88AA48 80241E78 44833000 */ mtc1 $v1, $f6 -/* 88AA4C 80241E7C 00000000 */ nop +/* 88AA4C 80241E7C 00000000 */ nop /* 88AA50 80241E80 468031A0 */ cvt.s.w $f6, $f6 /* 88AA54 80241E84 44073000 */ mfc1 $a3, $f6 /* 88AA58 80241E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80241CF4_88A8C4 /* 88AB10 80241F40 10600015 */ beqz $v1, .L80241F98 /* 88AB14 80241F44 0260202D */ daddu $a0, $s3, $zero /* 88AB18 80241F48 08090828 */ j .L802420A0 -/* 88AB1C 80241F4C 00000000 */ nop +/* 88AB1C 80241F4C 00000000 */ nop .L80241F50: /* 88AB20 80241F50 1062001C */ beq $v1, $v0, .L80241FC4 /* 88AB24 80241F54 24020003 */ addiu $v0, $zero, 3 /* 88AB28 80241F58 10620035 */ beq $v1, $v0, .L80242030 /* 88AB2C 80241F5C 0260202D */ daddu $a0, $s3, $zero /* 88AB30 80241F60 08090828 */ j .L802420A0 -/* 88AB34 80241F64 00000000 */ nop +/* 88AB34 80241F64 00000000 */ nop .L80241F68: /* 88AB38 80241F68 2402000E */ addiu $v0, $zero, 0xe /* 88AB3C 80241F6C 1062003F */ beq $v1, $v0, .L8024206C @@ -177,9 +177,9 @@ glabel func_80241CF4_88A8C4 /* 88AB50 80241F80 10620040 */ beq $v1, $v0, .L80242084 /* 88AB54 80241F84 24020063 */ addiu $v0, $zero, 0x63 /* 88AB58 80241F88 10620043 */ beq $v1, $v0, .L80242098 -/* 88AB5C 80241F8C 00000000 */ nop +/* 88AB5C 80241F8C 00000000 */ nop /* 88AB60 80241F90 08090828 */ j .L802420A0 -/* 88AB64 80241F94 00000000 */ nop +/* 88AB64 80241F94 00000000 */ nop .L80241F98: /* 88AB68 80241F98 0280282D */ daddu $a1, $s4, $zero /* 88AB6C 80241F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80241CF4_88A8C4 /* 88AB84 80241FB4 0C0125AE */ jal func_800496B8 /* 88AB88 80241FB8 02A0302D */ daddu $a2, $s5, $zero /* 88AB8C 80241FBC 08090828 */ j .L802420A0 -/* 88AB90 80241FC0 00000000 */ nop +/* 88AB90 80241FC0 00000000 */ nop .L80241FC4: /* 88AB94 80241FC4 0260202D */ daddu $a0, $s3, $zero /* 88AB98 80241FC8 0280282D */ daddu $a1, $s4, $zero -/* 88AB9C 80241FCC 0C0126D1 */ jal func_80049B44 +/* 88AB9C 80241FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 88ABA0 80241FD0 02A0302D */ daddu $a2, $s5, $zero /* 88ABA4 80241FD4 8E230088 */ lw $v1, 0x88($s1) /* 88ABA8 80241FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80241CF4_88A8C4 /* 88AC04 80242034 0C012701 */ jal func_80049C04 /* 88AC08 80242038 02A0302D */ daddu $a2, $s5, $zero /* 88AC0C 8024203C 08090828 */ j .L802420A0 -/* 88AC10 80242040 00000000 */ nop +/* 88AC10 80242040 00000000 */ nop .L80242044: /* 88AC14 80242044 0260202D */ daddu $a0, $s3, $zero /* 88AC18 80242048 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80241CF4_88A8C4 /* 88AC2C 8024205C 0C090677 */ jal func_802419DC_88A5AC /* 88AC30 80242060 02A0302D */ daddu $a2, $s5, $zero /* 88AC34 80242064 08090828 */ j .L802420A0 -/* 88AC38 80242068 00000000 */ nop +/* 88AC38 80242068 00000000 */ nop .L8024206C: /* 88AC3C 8024206C 0260202D */ daddu $a0, $s3, $zero /* 88AC40 80242070 0280282D */ daddu $a1, $s4, $zero /* 88AC44 80242074 0C0906C4 */ jal func_80241B10_88A6E0 /* 88AC48 80242078 02A0302D */ daddu $a2, $s5, $zero /* 88AC4C 8024207C 08090828 */ j .L802420A0 -/* 88AC50 80242080 00000000 */ nop +/* 88AC50 80242080 00000000 */ nop .L80242084: /* 88AC54 80242084 0280282D */ daddu $a1, $s4, $zero /* 88AC58 80242088 0C09071D */ jal tik_12_set_script_owner_npc_col_height /* 88AC5C 8024208C 02A0302D */ daddu $a2, $s5, $zero /* 88AC60 80242090 08090828 */ j .L802420A0 -/* 88AC64 80242094 00000000 */ nop +/* 88AC64 80242094 00000000 */ nop .L80242098: /* 88AC68 80242098 0C0129CF */ jal func_8004A73C /* 88AC6C 8024209C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80241CF4_88A8C4 /* 88ACC0 802420F0 00220821 */ addu $at, $at, $v0 /* 88ACC4 802420F4 8C2249D8 */ lw $v0, %lo(D_802449D8)($at) /* 88ACC8 802420F8 00400008 */ jr $v0 -/* 88ACCC 802420FC 00000000 */ nop +/* 88ACCC 802420FC 00000000 */ nop /* 88ACD0 80242100 8E420028 */ lw $v0, 0x28($s2) /* 88ACD4 80242104 24420001 */ addiu $v0, $v0, 1 /* 88ACD8 80242108 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_8024023C_88D83C.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_8024023C_88D83C.s deleted file mode 100644 index 9a9c13e360..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_8024023C_88D83C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_88D83C -/* 88D83C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 88D840 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 88D844 80240244 0080802D */ daddu $s0, $a0, $zero -/* 88D848 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 88D84C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 88D850 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 88D854 80240254 0C0B210B */ jal get_float_variable -/* 88D858 80240258 8C450000 */ lw $a1, ($v0) -/* 88D85C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 88D860 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 88D864 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 88D868 80240268 44060000 */ mfc1 $a2, $f0 -/* 88D86C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 88D870 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 88D874 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88D878 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 88D87C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 88D880 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 88D884 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 88D888 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 88D88C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 88D890 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 88D894 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 88D898 80240298 0C0B2190 */ jal set_float_variable -/* 88D89C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88D8A0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 88D8A4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 88D8A8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 88D8AC 802402AC 0C0B2190 */ jal set_float_variable -/* 88D8B0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88D8B4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 88D8B8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 88D8BC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 88D8C0 802402C0 0C0B2190 */ jal set_float_variable -/* 88D8C4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88D8C8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 88D8CC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 88D8D0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 88D8D4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 88D8D8 802402D8 03E00008 */ jr $ra -/* 88D8DC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_8024023C_88FDDC.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_8024023C_88FDDC.s deleted file mode 100644 index cd12d76e46..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_8024023C_88FDDC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_88FDDC -/* 88FDDC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 88FDE0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 88FDE4 80240244 0080802D */ daddu $s0, $a0, $zero -/* 88FDE8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 88FDEC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 88FDF0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 88FDF4 80240254 0C0B210B */ jal get_float_variable -/* 88FDF8 80240258 8C450000 */ lw $a1, ($v0) -/* 88FDFC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 88FE00 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 88FE04 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 88FE08 80240268 44060000 */ mfc1 $a2, $f0 -/* 88FE0C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 88FE10 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 88FE14 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88FE18 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 88FE1C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 88FE20 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 88FE24 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 88FE28 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 88FE2C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 88FE30 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 88FE34 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 88FE38 80240298 0C0B2190 */ jal set_float_variable -/* 88FE3C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88FE40 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 88FE44 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 88FE48 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 88FE4C 802402AC 0C0B2190 */ jal set_float_variable -/* 88FE50 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88FE54 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 88FE58 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 88FE5C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 88FE60 802402C0 0C0B2190 */ jal set_float_variable -/* 88FE64 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88FE68 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 88FE6C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 88FE70 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 88FE74 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 88FE78 802402D8 03E00008 */ jr $ra -/* 88FE7C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240FAC_8939CC.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240FAC_8939CC.s deleted file mode 100644 index c126ddf6d9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240FAC_8939CC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FAC_8939CC -/* 8939CC 80240FAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8939D0 80240FB0 AFB00018 */ sw $s0, 0x18($sp) -/* 8939D4 80240FB4 0080802D */ daddu $s0, $a0, $zero -/* 8939D8 80240FB8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8939DC 80240FBC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8939E0 80240FC0 8E02000C */ lw $v0, 0xc($s0) -/* 8939E4 80240FC4 0C0B210B */ jal get_float_variable -/* 8939E8 80240FC8 8C450000 */ lw $a1, ($v0) -/* 8939EC 80240FCC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8939F0 80240FD0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8939F4 80240FD4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8939F8 80240FD8 44060000 */ mfc1 $a2, $f0 -/* 8939FC 80240FDC C4400028 */ lwc1 $f0, 0x28($v0) -/* 893A00 80240FE0 C4420030 */ lwc1 $f2, 0x30($v0) -/* 893A04 80240FE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 893A08 80240FE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 893A0C 80240FEC 8C470080 */ lw $a3, 0x80($v0) -/* 893A10 80240FF0 C454002C */ lwc1 $f20, 0x2c($v0) -/* 893A14 80240FF4 0C00A7E7 */ jal add_vec2D_polar -/* 893A18 80240FF8 27A50014 */ addiu $a1, $sp, 0x14 -/* 893A1C 80240FFC 0200202D */ daddu $a0, $s0, $zero -/* 893A20 80241000 3C05FE36 */ lui $a1, 0xfe36 -/* 893A24 80241004 8FA60010 */ lw $a2, 0x10($sp) -/* 893A28 80241008 0C0B2190 */ jal set_float_variable -/* 893A2C 8024100C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 893A30 80241010 0200202D */ daddu $a0, $s0, $zero -/* 893A34 80241014 3C05FE36 */ lui $a1, 0xfe36 -/* 893A38 80241018 4406A000 */ mfc1 $a2, $f20 -/* 893A3C 8024101C 0C0B2190 */ jal set_float_variable -/* 893A40 80241020 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 893A44 80241024 0200202D */ daddu $a0, $s0, $zero -/* 893A48 80241028 3C05FE36 */ lui $a1, 0xfe36 -/* 893A4C 8024102C 8FA60014 */ lw $a2, 0x14($sp) -/* 893A50 80241030 0C0B2190 */ jal set_float_variable -/* 893A54 80241034 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 893A58 80241038 8FBF001C */ lw $ra, 0x1c($sp) -/* 893A5C 8024103C 8FB00018 */ lw $s0, 0x18($sp) -/* 893A60 80241040 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 893A64 80241044 24020002 */ addiu $v0, $zero, 2 -/* 893A68 80241048 03E00008 */ jr $ra -/* 893A6C 8024104C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_8024023C_89781C.s b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_8024023C_89781C.s deleted file mode 100644 index 0264025c88..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_8024023C_89781C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_89781C -/* 89781C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 897820 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 897824 80240244 0080802D */ daddu $s0, $a0, $zero -/* 897828 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 89782C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 897830 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 897834 80240254 0C0B210B */ jal get_float_variable -/* 897838 80240258 8C450000 */ lw $a1, ($v0) -/* 89783C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 897840 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 897844 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 897848 80240268 44060000 */ mfc1 $a2, $f0 -/* 89784C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 897850 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 897854 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 897858 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89785C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 897860 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 897864 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 897868 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 89786C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 897870 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 897874 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 897878 80240298 0C0B2190 */ jal set_float_variable -/* 89787C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 897880 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 897884 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 897888 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 89788C 802402AC 0C0B2190 */ jal set_float_variable -/* 897890 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 897894 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 897898 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 89789C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 8978A0 802402C0 0C0B2190 */ jal set_float_variable -/* 8978A4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8978A8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8978AC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8978B0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8978B4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 8978B8 802402D8 03E00008 */ jr $ra -/* 8978BC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240548_89A898.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240548_89A898.s deleted file mode 100644 index 1b5f9b2889..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240548_89A898.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548_89A898 -/* 89A898 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 89A89C 8024054C AFB00018 */ sw $s0, 0x18($sp) -/* 89A8A0 80240550 0080802D */ daddu $s0, $a0, $zero -/* 89A8A4 80240554 AFBF001C */ sw $ra, 0x1c($sp) -/* 89A8A8 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 89A8AC 8024055C 8E02000C */ lw $v0, 0xc($s0) -/* 89A8B0 80240560 0C0B210B */ jal get_float_variable -/* 89A8B4 80240564 8C450000 */ lw $a1, ($v0) -/* 89A8B8 80240568 27A40010 */ addiu $a0, $sp, 0x10 -/* 89A8BC 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 89A8C0 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 89A8C4 80240574 44060000 */ mfc1 $a2, $f0 -/* 89A8C8 80240578 C4400028 */ lwc1 $f0, 0x28($v0) -/* 89A8CC 8024057C C4420030 */ lwc1 $f2, 0x30($v0) -/* 89A8D0 80240580 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89A8D4 80240584 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89A8D8 80240588 8C470080 */ lw $a3, 0x80($v0) -/* 89A8DC 8024058C C454002C */ lwc1 $f20, 0x2c($v0) -/* 89A8E0 80240590 0C00A7E7 */ jal add_vec2D_polar -/* 89A8E4 80240594 27A50014 */ addiu $a1, $sp, 0x14 -/* 89A8E8 80240598 0200202D */ daddu $a0, $s0, $zero -/* 89A8EC 8024059C 3C05FE36 */ lui $a1, 0xfe36 -/* 89A8F0 802405A0 8FA60010 */ lw $a2, 0x10($sp) -/* 89A8F4 802405A4 0C0B2190 */ jal set_float_variable -/* 89A8F8 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89A8FC 802405AC 0200202D */ daddu $a0, $s0, $zero -/* 89A900 802405B0 3C05FE36 */ lui $a1, 0xfe36 -/* 89A904 802405B4 4406A000 */ mfc1 $a2, $f20 -/* 89A908 802405B8 0C0B2190 */ jal set_float_variable -/* 89A90C 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89A910 802405C0 0200202D */ daddu $a0, $s0, $zero -/* 89A914 802405C4 3C05FE36 */ lui $a1, 0xfe36 -/* 89A918 802405C8 8FA60014 */ lw $a2, 0x14($sp) -/* 89A91C 802405CC 0C0B2190 */ jal set_float_variable -/* 89A920 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89A924 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 89A928 802405D8 8FB00018 */ lw $s0, 0x18($sp) -/* 89A92C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 89A930 802405E0 24020002 */ addiu $v0, $zero, 2 -/* 89A934 802405E4 03E00008 */ jr $ra -/* 89A938 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s index 42f27bcd4e..9e629e88a1 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s @@ -55,7 +55,7 @@ glabel func_80240CF4_89B044 /* 89B108 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 89B10C 80240DBC 30420004 */ andi $v0, $v0, 4 /* 89B110 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 89B114 80240DC4 00000000 */ nop +/* 89B114 80240DC4 00000000 */ nop .L80240DC8: /* 89B118 80240DC8 AE600070 */ sw $zero, 0x70($s3) /* 89B11C 80240DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240CF4_89B044 /* 89B1C0 80240E70 24020028 */ addiu $v0, $zero, 0x28 /* 89B1C4 80240E74 AFA2001C */ sw $v0, 0x1c($sp) /* 89B1C8 80240E78 44833000 */ mtc1 $v1, $f6 -/* 89B1CC 80240E7C 00000000 */ nop +/* 89B1CC 80240E7C 00000000 */ nop /* 89B1D0 80240E80 468031A0 */ cvt.s.w $f6, $f6 /* 89B1D4 80240E84 44073000 */ mfc1 $a3, $f6 /* 89B1D8 80240E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240CF4_89B044 /* 89B290 80240F40 10600015 */ beqz $v1, .L80240F98 /* 89B294 80240F44 0260202D */ daddu $a0, $s3, $zero /* 89B298 80240F48 08090428 */ j .L802410A0 -/* 89B29C 80240F4C 00000000 */ nop +/* 89B29C 80240F4C 00000000 */ nop .L80240F50: /* 89B2A0 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 /* 89B2A4 80240F54 24020003 */ addiu $v0, $zero, 3 /* 89B2A8 80240F58 10620035 */ beq $v1, $v0, .L80241030 /* 89B2AC 80240F5C 0260202D */ daddu $a0, $s3, $zero /* 89B2B0 80240F60 08090428 */ j .L802410A0 -/* 89B2B4 80240F64 00000000 */ nop +/* 89B2B4 80240F64 00000000 */ nop .L80240F68: /* 89B2B8 80240F68 2402000E */ addiu $v0, $zero, 0xe /* 89B2BC 80240F6C 1062003F */ beq $v1, $v0, .L8024106C @@ -177,9 +177,9 @@ glabel func_80240CF4_89B044 /* 89B2D0 80240F80 10620040 */ beq $v1, $v0, .L80241084 /* 89B2D4 80240F84 24020063 */ addiu $v0, $zero, 0x63 /* 89B2D8 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 89B2DC 80240F8C 00000000 */ nop +/* 89B2DC 80240F8C 00000000 */ nop /* 89B2E0 80240F90 08090428 */ j .L802410A0 -/* 89B2E4 80240F94 00000000 */ nop +/* 89B2E4 80240F94 00000000 */ nop .L80240F98: /* 89B2E8 80240F98 0280282D */ daddu $a1, $s4, $zero /* 89B2EC 80240F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240CF4_89B044 /* 89B304 80240FB4 0C0125AE */ jal func_800496B8 /* 89B308 80240FB8 02A0302D */ daddu $a2, $s5, $zero /* 89B30C 80240FBC 08090428 */ j .L802410A0 -/* 89B310 80240FC0 00000000 */ nop +/* 89B310 80240FC0 00000000 */ nop .L80240FC4: /* 89B314 80240FC4 0260202D */ daddu $a0, $s3, $zero /* 89B318 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 89B31C 80240FCC 0C0126D1 */ jal func_80049B44 +/* 89B31C 80240FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 89B320 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* 89B324 80240FD4 8E230088 */ lw $v1, 0x88($s1) /* 89B328 80240FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240CF4_89B044 /* 89B384 80241034 0C012701 */ jal func_80049C04 /* 89B388 80241038 02A0302D */ daddu $a2, $s5, $zero /* 89B38C 8024103C 08090428 */ j .L802410A0 -/* 89B390 80241040 00000000 */ nop +/* 89B390 80241040 00000000 */ nop .L80241044: /* 89B394 80241044 0260202D */ daddu $a0, $s3, $zero /* 89B398 80241048 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240CF4_89B044 /* 89B3AC 8024105C 0C090277 */ jal func_802409DC_89AD2C /* 89B3B0 80241060 02A0302D */ daddu $a2, $s5, $zero /* 89B3B4 80241064 08090428 */ j .L802410A0 -/* 89B3B8 80241068 00000000 */ nop +/* 89B3B8 80241068 00000000 */ nop .L8024106C: /* 89B3BC 8024106C 0260202D */ daddu $a0, $s3, $zero /* 89B3C0 80241070 0280282D */ daddu $a1, $s4, $zero /* 89B3C4 80241074 0C0902C4 */ jal func_80240B10_89AE60 /* 89B3C8 80241078 02A0302D */ daddu $a2, $s5, $zero /* 89B3CC 8024107C 08090428 */ j .L802410A0 -/* 89B3D0 80241080 00000000 */ nop +/* 89B3D0 80241080 00000000 */ nop .L80241084: /* 89B3D4 80241084 0280282D */ daddu $a1, $s4, $zero /* 89B3D8 80241088 0C09031D */ jal func_80240C74_89AFC4 /* 89B3DC 8024108C 02A0302D */ daddu $a2, $s5, $zero /* 89B3E0 80241090 08090428 */ j .L802410A0 -/* 89B3E4 80241094 00000000 */ nop +/* 89B3E4 80241094 00000000 */ nop .L80241098: /* 89B3E8 80241098 0C0129CF */ jal func_8004A73C /* 89B3EC 8024109C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240CF4_89B044 /* 89B440 802410F0 00220821 */ addu $at, $at, $v0 /* 89B444 802410F4 8C2233F8 */ lw $v0, %lo(D_802433F8)($at) /* 89B448 802410F8 00400008 */ jr $v0 -/* 89B44C 802410FC 00000000 */ nop +/* 89B44C 802410FC 00000000 */ nop /* 89B450 80241100 8E420028 */ lw $v0, 0x28($s2) /* 89B454 80241104 24420001 */ addiu $v0, $v0, 1 /* 89B458 80241108 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240CF4_89B044 /* 89B478 80241128 8FB00050 */ lw $s0, 0x50($sp) /* 89B47C 8024112C 03E00008 */ jr $ra /* 89B480 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 89B484 80241134 00000000 */ nop -/* 89B488 80241138 00000000 */ nop -/* 89B48C 8024113C 00000000 */ nop +/* 89B484 80241134 00000000 */ nop +/* 89B488 80241138 00000000 */ nop +/* 89B48C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240548_89DCE8.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240548_89DCE8.s deleted file mode 100644 index 7d155a3ef5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240548_89DCE8.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548_89DCE8 -/* 89DCE8 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 89DCEC 8024054C AFB00018 */ sw $s0, 0x18($sp) -/* 89DCF0 80240550 0080802D */ daddu $s0, $a0, $zero -/* 89DCF4 80240554 AFBF001C */ sw $ra, 0x1c($sp) -/* 89DCF8 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 89DCFC 8024055C 8E02000C */ lw $v0, 0xc($s0) -/* 89DD00 80240560 0C0B210B */ jal get_float_variable -/* 89DD04 80240564 8C450000 */ lw $a1, ($v0) -/* 89DD08 80240568 27A40010 */ addiu $a0, $sp, 0x10 -/* 89DD0C 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 89DD10 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 89DD14 80240574 44060000 */ mfc1 $a2, $f0 -/* 89DD18 80240578 C4400028 */ lwc1 $f0, 0x28($v0) -/* 89DD1C 8024057C C4420030 */ lwc1 $f2, 0x30($v0) -/* 89DD20 80240580 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89DD24 80240584 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89DD28 80240588 8C470080 */ lw $a3, 0x80($v0) -/* 89DD2C 8024058C C454002C */ lwc1 $f20, 0x2c($v0) -/* 89DD30 80240590 0C00A7E7 */ jal add_vec2D_polar -/* 89DD34 80240594 27A50014 */ addiu $a1, $sp, 0x14 -/* 89DD38 80240598 0200202D */ daddu $a0, $s0, $zero -/* 89DD3C 8024059C 3C05FE36 */ lui $a1, 0xfe36 -/* 89DD40 802405A0 8FA60010 */ lw $a2, 0x10($sp) -/* 89DD44 802405A4 0C0B2190 */ jal set_float_variable -/* 89DD48 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89DD4C 802405AC 0200202D */ daddu $a0, $s0, $zero -/* 89DD50 802405B0 3C05FE36 */ lui $a1, 0xfe36 -/* 89DD54 802405B4 4406A000 */ mfc1 $a2, $f20 -/* 89DD58 802405B8 0C0B2190 */ jal set_float_variable -/* 89DD5C 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89DD60 802405C0 0200202D */ daddu $a0, $s0, $zero -/* 89DD64 802405C4 3C05FE36 */ lui $a1, 0xfe36 -/* 89DD68 802405C8 8FA60014 */ lw $a2, 0x14($sp) -/* 89DD6C 802405CC 0C0B2190 */ jal set_float_variable -/* 89DD70 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89DD74 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 89DD78 802405D8 8FB00018 */ lw $s0, 0x18($sp) -/* 89DD7C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 89DD80 802405E0 24020002 */ addiu $v0, $zero, 2 -/* 89DD84 802405E4 03E00008 */ jr $ra -/* 89DD88 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240578_8A0438.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240578_8A0438.s deleted file mode 100644 index 93520fb7ca..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240578_8A0438.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_8A0438 -/* 8A0438 80240578 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A043C 8024057C AFB00018 */ sw $s0, 0x18($sp) -/* 8A0440 80240580 0080802D */ daddu $s0, $a0, $zero -/* 8A0444 80240584 AFBF001C */ sw $ra, 0x1c($sp) -/* 8A0448 80240588 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8A044C 8024058C 8E02000C */ lw $v0, 0xc($s0) -/* 8A0450 80240590 0C0B210B */ jal get_float_variable -/* 8A0454 80240594 8C450000 */ lw $a1, ($v0) -/* 8A0458 80240598 27A40010 */ addiu $a0, $sp, 0x10 -/* 8A045C 8024059C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8A0460 802405A0 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8A0464 802405A4 44060000 */ mfc1 $a2, $f0 -/* 8A0468 802405A8 C4400028 */ lwc1 $f0, 0x28($v0) -/* 8A046C 802405AC C4420030 */ lwc1 $f2, 0x30($v0) -/* 8A0470 802405B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8A0474 802405B4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8A0478 802405B8 8C470080 */ lw $a3, 0x80($v0) -/* 8A047C 802405BC C454002C */ lwc1 $f20, 0x2c($v0) -/* 8A0480 802405C0 0C00A7E7 */ jal add_vec2D_polar -/* 8A0484 802405C4 27A50014 */ addiu $a1, $sp, 0x14 -/* 8A0488 802405C8 0200202D */ daddu $a0, $s0, $zero -/* 8A048C 802405CC 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0490 802405D0 8FA60010 */ lw $a2, 0x10($sp) -/* 8A0494 802405D4 0C0B2190 */ jal set_float_variable -/* 8A0498 802405D8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A049C 802405DC 0200202D */ daddu $a0, $s0, $zero -/* 8A04A0 802405E0 3C05FE36 */ lui $a1, 0xfe36 -/* 8A04A4 802405E4 4406A000 */ mfc1 $a2, $f20 -/* 8A04A8 802405E8 0C0B2190 */ jal set_float_variable -/* 8A04AC 802405EC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A04B0 802405F0 0200202D */ daddu $a0, $s0, $zero -/* 8A04B4 802405F4 3C05FE36 */ lui $a1, 0xfe36 -/* 8A04B8 802405F8 8FA60014 */ lw $a2, 0x14($sp) -/* 8A04BC 802405FC 0C0B2190 */ jal set_float_variable -/* 8A04C0 80240600 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A04C4 80240604 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A04C8 80240608 8FB00018 */ lw $s0, 0x18($sp) -/* 8A04CC 8024060C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8A04D0 80240610 24020002 */ addiu $v0, $zero, 2 -/* 8A04D4 80240614 03E00008 */ jr $ra -/* 8A04D8 80240618 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_8024023C_8A260C.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_8024023C_8A260C.s deleted file mode 100644 index c203396a82..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_8024023C_8A260C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8A260C -/* 8A260C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A2610 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 8A2614 80240244 0080802D */ daddu $s0, $a0, $zero -/* 8A2618 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 8A261C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8A2620 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 8A2624 80240254 0C0B210B */ jal get_float_variable -/* 8A2628 80240258 8C450000 */ lw $a1, ($v0) -/* 8A262C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8A2630 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8A2634 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8A2638 80240268 44060000 */ mfc1 $a2, $f0 -/* 8A263C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 8A2640 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8A2644 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8A2648 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8A264C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 8A2650 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8A2654 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 8A2658 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 8A265C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 8A2660 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2664 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 8A2668 80240298 0C0B2190 */ jal set_float_variable -/* 8A266C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A2670 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 8A2674 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2678 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 8A267C 802402AC 0C0B2190 */ jal set_float_variable -/* 8A2680 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A2684 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 8A2688 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 8A268C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 8A2690 802402C0 0C0B2190 */ jal set_float_variable -/* 8A2694 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A2698 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A269C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8A26A0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8A26A4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 8A26A8 802402D8 03E00008 */ jr $ra -/* 8A26AC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s index 1538d70411..b8b816f800 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s @@ -55,7 +55,7 @@ glabel func_80240CF4_8A30C4 /* 8A3188 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 8A318C 80240DBC 30420004 */ andi $v0, $v0, 4 /* 8A3190 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 8A3194 80240DC4 00000000 */ nop +/* 8A3194 80240DC4 00000000 */ nop .L80240DC8: /* 8A3198 80240DC8 AE600070 */ sw $zero, 0x70($s3) /* 8A319C 80240DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240CF4_8A30C4 /* 8A3240 80240E70 24020028 */ addiu $v0, $zero, 0x28 /* 8A3244 80240E74 AFA2001C */ sw $v0, 0x1c($sp) /* 8A3248 80240E78 44833000 */ mtc1 $v1, $f6 -/* 8A324C 80240E7C 00000000 */ nop +/* 8A324C 80240E7C 00000000 */ nop /* 8A3250 80240E80 468031A0 */ cvt.s.w $f6, $f6 /* 8A3254 80240E84 44073000 */ mfc1 $a3, $f6 /* 8A3258 80240E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240CF4_8A30C4 /* 8A3310 80240F40 10600015 */ beqz $v1, .L80240F98 /* 8A3314 80240F44 0260202D */ daddu $a0, $s3, $zero /* 8A3318 80240F48 08090428 */ j .L802410A0 -/* 8A331C 80240F4C 00000000 */ nop +/* 8A331C 80240F4C 00000000 */ nop .L80240F50: /* 8A3320 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 /* 8A3324 80240F54 24020003 */ addiu $v0, $zero, 3 /* 8A3328 80240F58 10620035 */ beq $v1, $v0, .L80241030 /* 8A332C 80240F5C 0260202D */ daddu $a0, $s3, $zero /* 8A3330 80240F60 08090428 */ j .L802410A0 -/* 8A3334 80240F64 00000000 */ nop +/* 8A3334 80240F64 00000000 */ nop .L80240F68: /* 8A3338 80240F68 2402000E */ addiu $v0, $zero, 0xe /* 8A333C 80240F6C 1062003F */ beq $v1, $v0, .L8024106C @@ -177,9 +177,9 @@ glabel func_80240CF4_8A30C4 /* 8A3350 80240F80 10620040 */ beq $v1, $v0, .L80241084 /* 8A3354 80240F84 24020063 */ addiu $v0, $zero, 0x63 /* 8A3358 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 8A335C 80240F8C 00000000 */ nop +/* 8A335C 80240F8C 00000000 */ nop /* 8A3360 80240F90 08090428 */ j .L802410A0 -/* 8A3364 80240F94 00000000 */ nop +/* 8A3364 80240F94 00000000 */ nop .L80240F98: /* 8A3368 80240F98 0280282D */ daddu $a1, $s4, $zero /* 8A336C 80240F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240CF4_8A30C4 /* 8A3384 80240FB4 0C0125AE */ jal func_800496B8 /* 8A3388 80240FB8 02A0302D */ daddu $a2, $s5, $zero /* 8A338C 80240FBC 08090428 */ j .L802410A0 -/* 8A3390 80240FC0 00000000 */ nop +/* 8A3390 80240FC0 00000000 */ nop .L80240FC4: /* 8A3394 80240FC4 0260202D */ daddu $a0, $s3, $zero /* 8A3398 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 8A339C 80240FCC 0C0126D1 */ jal func_80049B44 +/* 8A339C 80240FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 8A33A0 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* 8A33A4 80240FD4 8E230088 */ lw $v1, 0x88($s1) /* 8A33A8 80240FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240CF4_8A30C4 /* 8A3404 80241034 0C012701 */ jal func_80049C04 /* 8A3408 80241038 02A0302D */ daddu $a2, $s5, $zero /* 8A340C 8024103C 08090428 */ j .L802410A0 -/* 8A3410 80241040 00000000 */ nop +/* 8A3410 80241040 00000000 */ nop .L80241044: /* 8A3414 80241044 0260202D */ daddu $a0, $s3, $zero /* 8A3418 80241048 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240CF4_8A30C4 /* 8A342C 8024105C 0C090277 */ jal func_802409DC_8A2DAC /* 8A3430 80241060 02A0302D */ daddu $a2, $s5, $zero /* 8A3434 80241064 08090428 */ j .L802410A0 -/* 8A3438 80241068 00000000 */ nop +/* 8A3438 80241068 00000000 */ nop .L8024106C: /* 8A343C 8024106C 0260202D */ daddu $a0, $s3, $zero /* 8A3440 80241070 0280282D */ daddu $a1, $s4, $zero /* 8A3444 80241074 0C0902C4 */ jal func_80240B10_8A2EE0 /* 8A3448 80241078 02A0302D */ daddu $a2, $s5, $zero /* 8A344C 8024107C 08090428 */ j .L802410A0 -/* 8A3450 80241080 00000000 */ nop +/* 8A3450 80241080 00000000 */ nop .L80241084: /* 8A3454 80241084 0280282D */ daddu $a1, $s4, $zero /* 8A3458 80241088 0C09031D */ jal func_80240C74_8A3044 /* 8A345C 8024108C 02A0302D */ daddu $a2, $s5, $zero /* 8A3460 80241090 08090428 */ j .L802410A0 -/* 8A3464 80241094 00000000 */ nop +/* 8A3464 80241094 00000000 */ nop .L80241098: /* 8A3468 80241098 0C0129CF */ jal func_8004A73C /* 8A346C 8024109C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240CF4_8A30C4 /* 8A34C0 802410F0 00220821 */ addu $at, $at, $v0 /* 8A34C4 802410F4 8C223658 */ lw $v0, %lo(D_80243658)($at) /* 8A34C8 802410F8 00400008 */ jr $v0 -/* 8A34CC 802410FC 00000000 */ nop +/* 8A34CC 802410FC 00000000 */ nop /* 8A34D0 80241100 8E420028 */ lw $v0, 0x28($s2) /* 8A34D4 80241104 24420001 */ addiu $v0, $v0, 1 /* 8A34D8 80241108 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240CF4_8A30C4 /* 8A34F8 80241128 8FB00050 */ lw $s0, 0x50($sp) /* 8A34FC 8024112C 03E00008 */ jr $ra /* 8A3500 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A3504 80241134 00000000 */ nop -/* 8A3508 80241138 00000000 */ nop -/* 8A350C 8024113C 00000000 */ nop +/* 8A3504 80241134 00000000 */ nop +/* 8A3508 80241138 00000000 */ nop +/* 8A350C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s index 9b23102e70..bde4d07887 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s @@ -55,7 +55,7 @@ glabel func_80240A64_8A64E4 /* 8A65A8 80240B28 8E2200B0 */ lw $v0, 0xb0($s1) /* 8A65AC 80240B2C 30420004 */ andi $v0, $v0, 4 /* 8A65B0 80240B30 10400047 */ beqz $v0, .L80240C50 -/* 8A65B4 80240B34 00000000 */ nop +/* 8A65B4 80240B34 00000000 */ nop .L80240B38: /* 8A65B8 80240B38 AE600070 */ sw $zero, 0x70($s3) /* 8A65BC 80240B3C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240A64_8A64E4 /* 8A6660 80240BE0 24020028 */ addiu $v0, $zero, 0x28 /* 8A6664 80240BE4 AFA2001C */ sw $v0, 0x1c($sp) /* 8A6668 80240BE8 44833000 */ mtc1 $v1, $f6 -/* 8A666C 80240BEC 00000000 */ nop +/* 8A666C 80240BEC 00000000 */ nop /* 8A6670 80240BF0 468031A0 */ cvt.s.w $f6, $f6 /* 8A6674 80240BF4 44073000 */ mfc1 $a3, $f6 /* 8A6678 80240BF8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240A64_8A64E4 /* 8A6730 80240CB0 10600015 */ beqz $v1, .L80240D08 /* 8A6734 80240CB4 0260202D */ daddu $a0, $s3, $zero /* 8A6738 80240CB8 08090384 */ j .L80240E10 -/* 8A673C 80240CBC 00000000 */ nop +/* 8A673C 80240CBC 00000000 */ nop .L80240CC0: /* 8A6740 80240CC0 1062001C */ beq $v1, $v0, .L80240D34 /* 8A6744 80240CC4 24020003 */ addiu $v0, $zero, 3 /* 8A6748 80240CC8 10620035 */ beq $v1, $v0, .L80240DA0 /* 8A674C 80240CCC 0260202D */ daddu $a0, $s3, $zero /* 8A6750 80240CD0 08090384 */ j .L80240E10 -/* 8A6754 80240CD4 00000000 */ nop +/* 8A6754 80240CD4 00000000 */ nop .L80240CD8: /* 8A6758 80240CD8 2402000E */ addiu $v0, $zero, 0xe /* 8A675C 80240CDC 1062003F */ beq $v1, $v0, .L80240DDC @@ -177,9 +177,9 @@ glabel func_80240A64_8A64E4 /* 8A6770 80240CF0 10620040 */ beq $v1, $v0, .L80240DF4 /* 8A6774 80240CF4 24020063 */ addiu $v0, $zero, 0x63 /* 8A6778 80240CF8 10620043 */ beq $v1, $v0, .L80240E08 -/* 8A677C 80240CFC 00000000 */ nop +/* 8A677C 80240CFC 00000000 */ nop /* 8A6780 80240D00 08090384 */ j .L80240E10 -/* 8A6784 80240D04 00000000 */ nop +/* 8A6784 80240D04 00000000 */ nop .L80240D08: /* 8A6788 80240D08 0280282D */ daddu $a1, $s4, $zero /* 8A678C 80240D0C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240A64_8A64E4 /* 8A67A4 80240D24 0C0125AE */ jal func_800496B8 /* 8A67A8 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 8A67AC 80240D2C 08090384 */ j .L80240E10 -/* 8A67B0 80240D30 00000000 */ nop +/* 8A67B0 80240D30 00000000 */ nop .L80240D34: /* 8A67B4 80240D34 0260202D */ daddu $a0, $s3, $zero /* 8A67B8 80240D38 0280282D */ daddu $a1, $s4, $zero -/* 8A67BC 80240D3C 0C0126D1 */ jal func_80049B44 +/* 8A67BC 80240D3C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 8A67C0 80240D40 02A0302D */ daddu $a2, $s5, $zero /* 8A67C4 80240D44 8E230088 */ lw $v1, 0x88($s1) /* 8A67C8 80240D48 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240A64_8A64E4 /* 8A6824 80240DA4 0C012701 */ jal func_80049C04 /* 8A6828 80240DA8 02A0302D */ daddu $a2, $s5, $zero /* 8A682C 80240DAC 08090384 */ j .L80240E10 -/* 8A6830 80240DB0 00000000 */ nop +/* 8A6830 80240DB0 00000000 */ nop .L80240DB4: /* 8A6834 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 8A6838 80240DB8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240A64_8A64E4 /* 8A684C 80240DCC 0C0901D3 */ jal func_8024074C_8A61CC /* 8A6850 80240DD0 02A0302D */ daddu $a2, $s5, $zero /* 8A6854 80240DD4 08090384 */ j .L80240E10 -/* 8A6858 80240DD8 00000000 */ nop +/* 8A6858 80240DD8 00000000 */ nop .L80240DDC: /* 8A685C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 8A6860 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 8A6864 80240DE4 0C090220 */ jal func_80240880_8A6300 /* 8A6868 80240DE8 02A0302D */ daddu $a2, $s5, $zero /* 8A686C 80240DEC 08090384 */ j .L80240E10 -/* 8A6870 80240DF0 00000000 */ nop +/* 8A6870 80240DF0 00000000 */ nop .L80240DF4: /* 8A6874 80240DF4 0280282D */ daddu $a1, $s4, $zero /* 8A6878 80240DF8 0C090279 */ jal func_802409E4_8A6464 /* 8A687C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* 8A6880 80240E00 08090384 */ j .L80240E10 -/* 8A6884 80240E04 00000000 */ nop +/* 8A6884 80240E04 00000000 */ nop .L80240E08: /* 8A6888 80240E08 0C0129CF */ jal func_8004A73C /* 8A688C 80240E0C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240A64_8A64E4 /* 8A68E0 80240E60 00220821 */ addu $at, $at, $v0 /* 8A68E4 80240E64 8C2224A8 */ lw $v0, %lo(D_802424A8)($at) /* 8A68E8 80240E68 00400008 */ jr $v0 -/* 8A68EC 80240E6C 00000000 */ nop +/* 8A68EC 80240E6C 00000000 */ nop /* 8A68F0 80240E70 8E420028 */ lw $v0, 0x28($s2) /* 8A68F4 80240E74 24420001 */ addiu $v0, $v0, 1 /* 8A68F8 80240E78 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240A64_8A64E4 /* 8A6918 80240E98 8FB00050 */ lw $s0, 0x50($sp) /* 8A691C 80240E9C 03E00008 */ jr $ra /* 8A6920 80240EA0 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A6924 80240EA4 00000000 */ nop -/* 8A6928 80240EA8 00000000 */ nop -/* 8A692C 80240EAC 00000000 */ nop +/* 8A6924 80240EA4 00000000 */ nop +/* 8A6928 80240EA8 00000000 */ nop +/* 8A692C 80240EAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s index fe2245969a..7f827877b9 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s @@ -55,7 +55,7 @@ glabel func_80240784_99D114 /* 99D1D8 80240848 8E2200B0 */ lw $v0, 0xb0($s1) /* 99D1DC 8024084C 30420004 */ andi $v0, $v0, 4 /* 99D1E0 80240850 10400047 */ beqz $v0, .L80240970 -/* 99D1E4 80240854 00000000 */ nop +/* 99D1E4 80240854 00000000 */ nop .L80240858: /* 99D1E8 80240858 AE600070 */ sw $zero, 0x70($s3) /* 99D1EC 8024085C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240784_99D114 /* 99D290 80240900 24020028 */ addiu $v0, $zero, 0x28 /* 99D294 80240904 AFA2001C */ sw $v0, 0x1c($sp) /* 99D298 80240908 44833000 */ mtc1 $v1, $f6 -/* 99D29C 8024090C 00000000 */ nop +/* 99D29C 8024090C 00000000 */ nop /* 99D2A0 80240910 468031A0 */ cvt.s.w $f6, $f6 /* 99D2A4 80240914 44073000 */ mfc1 $a3, $f6 /* 99D2A8 80240918 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240784_99D114 /* 99D360 802409D0 10600015 */ beqz $v1, .L80240A28 /* 99D364 802409D4 0260202D */ daddu $a0, $s3, $zero /* 99D368 802409D8 080902CC */ j .L80240B30 -/* 99D36C 802409DC 00000000 */ nop +/* 99D36C 802409DC 00000000 */ nop .L802409E0: /* 99D370 802409E0 1062001C */ beq $v1, $v0, .L80240A54 /* 99D374 802409E4 24020003 */ addiu $v0, $zero, 3 /* 99D378 802409E8 10620035 */ beq $v1, $v0, .L80240AC0 /* 99D37C 802409EC 0260202D */ daddu $a0, $s3, $zero /* 99D380 802409F0 080902CC */ j .L80240B30 -/* 99D384 802409F4 00000000 */ nop +/* 99D384 802409F4 00000000 */ nop .L802409F8: /* 99D388 802409F8 2402000E */ addiu $v0, $zero, 0xe /* 99D38C 802409FC 1062003F */ beq $v1, $v0, .L80240AFC @@ -177,9 +177,9 @@ glabel func_80240784_99D114 /* 99D3A0 80240A10 10620040 */ beq $v1, $v0, .L80240B14 /* 99D3A4 80240A14 24020063 */ addiu $v0, $zero, 0x63 /* 99D3A8 80240A18 10620043 */ beq $v1, $v0, .L80240B28 -/* 99D3AC 80240A1C 00000000 */ nop +/* 99D3AC 80240A1C 00000000 */ nop /* 99D3B0 80240A20 080902CC */ j .L80240B30 -/* 99D3B4 80240A24 00000000 */ nop +/* 99D3B4 80240A24 00000000 */ nop .L80240A28: /* 99D3B8 80240A28 0280282D */ daddu $a1, $s4, $zero /* 99D3BC 80240A2C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240784_99D114 /* 99D3D4 80240A44 0C0125AE */ jal func_800496B8 /* 99D3D8 80240A48 02A0302D */ daddu $a2, $s5, $zero /* 99D3DC 80240A4C 080902CC */ j .L80240B30 -/* 99D3E0 80240A50 00000000 */ nop +/* 99D3E0 80240A50 00000000 */ nop .L80240A54: /* 99D3E4 80240A54 0260202D */ daddu $a0, $s3, $zero /* 99D3E8 80240A58 0280282D */ daddu $a1, $s4, $zero -/* 99D3EC 80240A5C 0C0126D1 */ jal func_80049B44 +/* 99D3EC 80240A5C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 99D3F0 80240A60 02A0302D */ daddu $a2, $s5, $zero /* 99D3F4 80240A64 8E230088 */ lw $v1, 0x88($s1) /* 99D3F8 80240A68 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240784_99D114 /* 99D454 80240AC4 0C012701 */ jal func_80049C04 /* 99D458 80240AC8 02A0302D */ daddu $a2, $s5, $zero /* 99D45C 80240ACC 080902CC */ j .L80240B30 -/* 99D460 80240AD0 00000000 */ nop +/* 99D460 80240AD0 00000000 */ nop .L80240AD4: /* 99D464 80240AD4 0260202D */ daddu $a0, $s3, $zero /* 99D468 80240AD8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240784_99D114 /* 99D47C 80240AEC 0C09011B */ jal func_8024046C_99CDFC /* 99D480 80240AF0 02A0302D */ daddu $a2, $s5, $zero /* 99D484 80240AF4 080902CC */ j .L80240B30 -/* 99D488 80240AF8 00000000 */ nop +/* 99D488 80240AF8 00000000 */ nop .L80240AFC: /* 99D48C 80240AFC 0260202D */ daddu $a0, $s3, $zero /* 99D490 80240B00 0280282D */ daddu $a1, $s4, $zero /* 99D494 80240B04 0C090168 */ jal func_802405A0_99CF30 /* 99D498 80240B08 02A0302D */ daddu $a2, $s5, $zero /* 99D49C 80240B0C 080902CC */ j .L80240B30 -/* 99D4A0 80240B10 00000000 */ nop +/* 99D4A0 80240B10 00000000 */ nop .L80240B14: /* 99D4A4 80240B14 0280282D */ daddu $a1, $s4, $zero /* 99D4A8 80240B18 0C0901C1 */ jal func_80240704_99D094 /* 99D4AC 80240B1C 02A0302D */ daddu $a2, $s5, $zero /* 99D4B0 80240B20 080902CC */ j .L80240B30 -/* 99D4B4 80240B24 00000000 */ nop +/* 99D4B4 80240B24 00000000 */ nop .L80240B28: /* 99D4B8 80240B28 0C0129CF */ jal func_8004A73C /* 99D4BC 80240B2C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240784_99D114 /* 99D510 80240B80 00220821 */ addu $at, $at, $v0 /* 99D514 80240B84 8C224448 */ lw $v0, %lo(D_80244448)($at) /* 99D518 80240B88 00400008 */ jr $v0 -/* 99D51C 80240B8C 00000000 */ nop +/* 99D51C 80240B8C 00000000 */ nop /* 99D520 80240B90 8E420028 */ lw $v0, 0x28($s2) /* 99D524 80240B94 24420001 */ addiu $v0, $v0, 1 /* 99D528 80240B98 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s index 5801119de4..34f175fb55 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s @@ -55,7 +55,7 @@ glabel func_80240474_9A1454 /* 9A1518 80240538 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A151C 8024053C 30420004 */ andi $v0, $v0, 4 /* 9A1520 80240540 10400047 */ beqz $v0, .L80240660 -/* 9A1524 80240544 00000000 */ nop +/* 9A1524 80240544 00000000 */ nop .L80240548: /* 9A1528 80240548 AE600070 */ sw $zero, 0x70($s3) /* 9A152C 8024054C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240474_9A1454 /* 9A15D0 802405F0 24020028 */ addiu $v0, $zero, 0x28 /* 9A15D4 802405F4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A15D8 802405F8 44833000 */ mtc1 $v1, $f6 -/* 9A15DC 802405FC 00000000 */ nop +/* 9A15DC 802405FC 00000000 */ nop /* 9A15E0 80240600 468031A0 */ cvt.s.w $f6, $f6 /* 9A15E4 80240604 44073000 */ mfc1 $a3, $f6 /* 9A15E8 80240608 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240474_9A1454 /* 9A16A0 802406C0 10600015 */ beqz $v1, .L80240718 /* 9A16A4 802406C4 0260202D */ daddu $a0, $s3, $zero /* 9A16A8 802406C8 08090208 */ j .L80240820 -/* 9A16AC 802406CC 00000000 */ nop +/* 9A16AC 802406CC 00000000 */ nop .L802406D0: /* 9A16B0 802406D0 1062001C */ beq $v1, $v0, .L80240744 /* 9A16B4 802406D4 24020003 */ addiu $v0, $zero, 3 /* 9A16B8 802406D8 10620035 */ beq $v1, $v0, .L802407B0 /* 9A16BC 802406DC 0260202D */ daddu $a0, $s3, $zero /* 9A16C0 802406E0 08090208 */ j .L80240820 -/* 9A16C4 802406E4 00000000 */ nop +/* 9A16C4 802406E4 00000000 */ nop .L802406E8: /* 9A16C8 802406E8 2402000E */ addiu $v0, $zero, 0xe /* 9A16CC 802406EC 1062003F */ beq $v1, $v0, .L802407EC @@ -177,9 +177,9 @@ glabel func_80240474_9A1454 /* 9A16E0 80240700 10620040 */ beq $v1, $v0, .L80240804 /* 9A16E4 80240704 24020063 */ addiu $v0, $zero, 0x63 /* 9A16E8 80240708 10620043 */ beq $v1, $v0, .L80240818 -/* 9A16EC 8024070C 00000000 */ nop +/* 9A16EC 8024070C 00000000 */ nop /* 9A16F0 80240710 08090208 */ j .L80240820 -/* 9A16F4 80240714 00000000 */ nop +/* 9A16F4 80240714 00000000 */ nop .L80240718: /* 9A16F8 80240718 0280282D */ daddu $a1, $s4, $zero /* 9A16FC 8024071C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240474_9A1454 /* 9A1714 80240734 0C0125AE */ jal func_800496B8 /* 9A1718 80240738 02A0302D */ daddu $a2, $s5, $zero /* 9A171C 8024073C 08090208 */ j .L80240820 -/* 9A1720 80240740 00000000 */ nop +/* 9A1720 80240740 00000000 */ nop .L80240744: /* 9A1724 80240744 0260202D */ daddu $a0, $s3, $zero /* 9A1728 80240748 0280282D */ daddu $a1, $s4, $zero -/* 9A172C 8024074C 0C0126D1 */ jal func_80049B44 +/* 9A172C 8024074C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9A1730 80240750 02A0302D */ daddu $a2, $s5, $zero /* 9A1734 80240754 8E230088 */ lw $v1, 0x88($s1) /* 9A1738 80240758 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240474_9A1454 /* 9A1794 802407B4 0C012701 */ jal func_80049C04 /* 9A1798 802407B8 02A0302D */ daddu $a2, $s5, $zero /* 9A179C 802407BC 08090208 */ j .L80240820 -/* 9A17A0 802407C0 00000000 */ nop +/* 9A17A0 802407C0 00000000 */ nop .L802407C4: /* 9A17A4 802407C4 0260202D */ daddu $a0, $s3, $zero /* 9A17A8 802407C8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240474_9A1454 /* 9A17BC 802407DC 0C090057 */ jal func_8024015C_9A113C /* 9A17C0 802407E0 02A0302D */ daddu $a2, $s5, $zero /* 9A17C4 802407E4 08090208 */ j .L80240820 -/* 9A17C8 802407E8 00000000 */ nop +/* 9A17C8 802407E8 00000000 */ nop .L802407EC: /* 9A17CC 802407EC 0260202D */ daddu $a0, $s3, $zero /* 9A17D0 802407F0 0280282D */ daddu $a1, $s4, $zero /* 9A17D4 802407F4 0C0900A4 */ jal func_80240290_9A1270 /* 9A17D8 802407F8 02A0302D */ daddu $a2, $s5, $zero /* 9A17DC 802407FC 08090208 */ j .L80240820 -/* 9A17E0 80240800 00000000 */ nop +/* 9A17E0 80240800 00000000 */ nop .L80240804: /* 9A17E4 80240804 0280282D */ daddu $a1, $s4, $zero /* 9A17E8 80240808 0C0900FD */ jal func_802403F4_9A13D4 /* 9A17EC 8024080C 02A0302D */ daddu $a2, $s5, $zero /* 9A17F0 80240810 08090208 */ j .L80240820 -/* 9A17F4 80240814 00000000 */ nop +/* 9A17F4 80240814 00000000 */ nop .L80240818: /* 9A17F8 80240818 0C0129CF */ jal func_8004A73C /* 9A17FC 8024081C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240474_9A1454 /* 9A1850 80240870 00220821 */ addu $at, $at, $v0 /* 9A1854 80240874 8C2232E8 */ lw $v0, %lo(D_802432E8)($at) /* 9A1858 80240878 00400008 */ jr $v0 -/* 9A185C 8024087C 00000000 */ nop +/* 9A185C 8024087C 00000000 */ nop /* 9A1860 80240880 8E420028 */ lw $v0, 0x28($s2) /* 9A1864 80240884 24420001 */ addiu $v0, $v0, 1 /* 9A1868 80240888 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s index 0a669b5e70..82ad391b13 100644 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s @@ -55,7 +55,7 @@ glabel func_80240434_9A4A84 /* 9A4B48 802404F8 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A4B4C 802404FC 30420004 */ andi $v0, $v0, 4 /* 9A4B50 80240500 10400047 */ beqz $v0, .L80240620 -/* 9A4B54 80240504 00000000 */ nop +/* 9A4B54 80240504 00000000 */ nop .L80240508: /* 9A4B58 80240508 AE600070 */ sw $zero, 0x70($s3) /* 9A4B5C 8024050C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240434_9A4A84 /* 9A4C00 802405B0 24020028 */ addiu $v0, $zero, 0x28 /* 9A4C04 802405B4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A4C08 802405B8 44833000 */ mtc1 $v1, $f6 -/* 9A4C0C 802405BC 00000000 */ nop +/* 9A4C0C 802405BC 00000000 */ nop /* 9A4C10 802405C0 468031A0 */ cvt.s.w $f6, $f6 /* 9A4C14 802405C4 44073000 */ mfc1 $a3, $f6 /* 9A4C18 802405C8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240434_9A4A84 /* 9A4CD0 80240680 10600015 */ beqz $v1, .L802406D8 /* 9A4CD4 80240684 0260202D */ daddu $a0, $s3, $zero /* 9A4CD8 80240688 080901F8 */ j .L802407E0 -/* 9A4CDC 8024068C 00000000 */ nop +/* 9A4CDC 8024068C 00000000 */ nop .L80240690: /* 9A4CE0 80240690 1062001C */ beq $v1, $v0, .L80240704 /* 9A4CE4 80240694 24020003 */ addiu $v0, $zero, 3 /* 9A4CE8 80240698 10620035 */ beq $v1, $v0, .L80240770 /* 9A4CEC 8024069C 0260202D */ daddu $a0, $s3, $zero /* 9A4CF0 802406A0 080901F8 */ j .L802407E0 -/* 9A4CF4 802406A4 00000000 */ nop +/* 9A4CF4 802406A4 00000000 */ nop .L802406A8: /* 9A4CF8 802406A8 2402000E */ addiu $v0, $zero, 0xe /* 9A4CFC 802406AC 1062003F */ beq $v1, $v0, .L802407AC @@ -177,9 +177,9 @@ glabel func_80240434_9A4A84 /* 9A4D10 802406C0 10620040 */ beq $v1, $v0, .L802407C4 /* 9A4D14 802406C4 24020063 */ addiu $v0, $zero, 0x63 /* 9A4D18 802406C8 10620043 */ beq $v1, $v0, .L802407D8 -/* 9A4D1C 802406CC 00000000 */ nop +/* 9A4D1C 802406CC 00000000 */ nop /* 9A4D20 802406D0 080901F8 */ j .L802407E0 -/* 9A4D24 802406D4 00000000 */ nop +/* 9A4D24 802406D4 00000000 */ nop .L802406D8: /* 9A4D28 802406D8 0280282D */ daddu $a1, $s4, $zero /* 9A4D2C 802406DC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240434_9A4A84 /* 9A4D44 802406F4 0C0125AE */ jal func_800496B8 /* 9A4D48 802406F8 02A0302D */ daddu $a2, $s5, $zero /* 9A4D4C 802406FC 080901F8 */ j .L802407E0 -/* 9A4D50 80240700 00000000 */ nop +/* 9A4D50 80240700 00000000 */ nop .L80240704: /* 9A4D54 80240704 0260202D */ daddu $a0, $s3, $zero /* 9A4D58 80240708 0280282D */ daddu $a1, $s4, $zero -/* 9A4D5C 8024070C 0C0126D1 */ jal func_80049B44 +/* 9A4D5C 8024070C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9A4D60 80240710 02A0302D */ daddu $a2, $s5, $zero /* 9A4D64 80240714 8E230088 */ lw $v1, 0x88($s1) /* 9A4D68 80240718 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240434_9A4A84 /* 9A4DC4 80240774 0C012701 */ jal func_80049C04 /* 9A4DC8 80240778 02A0302D */ daddu $a2, $s5, $zero /* 9A4DCC 8024077C 080901F8 */ j .L802407E0 -/* 9A4DD0 80240780 00000000 */ nop +/* 9A4DD0 80240780 00000000 */ nop .L80240784: /* 9A4DD4 80240784 0260202D */ daddu $a0, $s3, $zero /* 9A4DD8 80240788 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240434_9A4A84 /* 9A4DEC 8024079C 0C090047 */ jal func_8024011C_9A476C /* 9A4DF0 802407A0 02A0302D */ daddu $a2, $s5, $zero /* 9A4DF4 802407A4 080901F8 */ j .L802407E0 -/* 9A4DF8 802407A8 00000000 */ nop +/* 9A4DF8 802407A8 00000000 */ nop .L802407AC: /* 9A4DFC 802407AC 0260202D */ daddu $a0, $s3, $zero /* 9A4E00 802407B0 0280282D */ daddu $a1, $s4, $zero /* 9A4E04 802407B4 0C090094 */ jal func_80240250_9A48A0 /* 9A4E08 802407B8 02A0302D */ daddu $a2, $s5, $zero /* 9A4E0C 802407BC 080901F8 */ j .L802407E0 -/* 9A4E10 802407C0 00000000 */ nop +/* 9A4E10 802407C0 00000000 */ nop .L802407C4: /* 9A4E14 802407C4 0280282D */ daddu $a1, $s4, $zero /* 9A4E18 802407C8 0C0900ED */ jal func_802403B4_9A4A04 /* 9A4E1C 802407CC 02A0302D */ daddu $a2, $s5, $zero /* 9A4E20 802407D0 080901F8 */ j .L802407E0 -/* 9A4E24 802407D4 00000000 */ nop +/* 9A4E24 802407D4 00000000 */ nop .L802407D8: /* 9A4E28 802407D8 0C0129CF */ jal func_8004A73C /* 9A4E2C 802407DC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240434_9A4A84 /* 9A4E80 80240830 00220821 */ addu $at, $at, $v0 /* 9A4E84 80240834 8C223D48 */ lw $v0, %lo(D_80243D48)($at) /* 9A4E88 80240838 00400008 */ jr $v0 -/* 9A4E8C 8024083C 00000000 */ nop +/* 9A4E8C 8024083C 00000000 */ nop /* 9A4E90 80240840 8E420028 */ lw $v0, 0x28($s2) /* 9A4E94 80240844 24420001 */ addiu $v0, $v0, 1 /* 9A4E98 80240848 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240434_9A4A84 /* 9A4EB8 80240868 8FB00050 */ lw $s0, 0x50($sp) /* 9A4EBC 8024086C 03E00008 */ jr $ra /* 9A4EC0 80240870 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A4EC4 80240874 00000000 */ nop -/* 9A4EC8 80240878 00000000 */ nop -/* 9A4ECC 8024087C 00000000 */ nop +/* 9A4EC4 80240874 00000000 */ nop +/* 9A4EC8 80240878 00000000 */ nop +/* 9A4ECC 8024087C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s index aa2a0bb835..b68f43f1ce 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s @@ -55,7 +55,7 @@ glabel func_80240844_9A8C34 /* 9A8CF8 80240908 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A8CFC 8024090C 30420004 */ andi $v0, $v0, 4 /* 9A8D00 80240910 10400047 */ beqz $v0, .L80240A30 -/* 9A8D04 80240914 00000000 */ nop +/* 9A8D04 80240914 00000000 */ nop .L80240918: /* 9A8D08 80240918 AE600070 */ sw $zero, 0x70($s3) /* 9A8D0C 8024091C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240844_9A8C34 /* 9A8DB0 802409C0 24020028 */ addiu $v0, $zero, 0x28 /* 9A8DB4 802409C4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A8DB8 802409C8 44833000 */ mtc1 $v1, $f6 -/* 9A8DBC 802409CC 00000000 */ nop +/* 9A8DBC 802409CC 00000000 */ nop /* 9A8DC0 802409D0 468031A0 */ cvt.s.w $f6, $f6 /* 9A8DC4 802409D4 44073000 */ mfc1 $a3, $f6 /* 9A8DC8 802409D8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240844_9A8C34 /* 9A8E80 80240A90 10600015 */ beqz $v1, .L80240AE8 /* 9A8E84 80240A94 0260202D */ daddu $a0, $s3, $zero /* 9A8E88 80240A98 080902FC */ j .L80240BF0 -/* 9A8E8C 80240A9C 00000000 */ nop +/* 9A8E8C 80240A9C 00000000 */ nop .L80240AA0: /* 9A8E90 80240AA0 1062001C */ beq $v1, $v0, .L80240B14 /* 9A8E94 80240AA4 24020003 */ addiu $v0, $zero, 3 /* 9A8E98 80240AA8 10620035 */ beq $v1, $v0, .L80240B80 /* 9A8E9C 80240AAC 0260202D */ daddu $a0, $s3, $zero /* 9A8EA0 80240AB0 080902FC */ j .L80240BF0 -/* 9A8EA4 80240AB4 00000000 */ nop +/* 9A8EA4 80240AB4 00000000 */ nop .L80240AB8: /* 9A8EA8 80240AB8 2402000E */ addiu $v0, $zero, 0xe /* 9A8EAC 80240ABC 1062003F */ beq $v1, $v0, .L80240BBC @@ -177,9 +177,9 @@ glabel func_80240844_9A8C34 /* 9A8EC0 80240AD0 10620040 */ beq $v1, $v0, .L80240BD4 /* 9A8EC4 80240AD4 24020063 */ addiu $v0, $zero, 0x63 /* 9A8EC8 80240AD8 10620043 */ beq $v1, $v0, .L80240BE8 -/* 9A8ECC 80240ADC 00000000 */ nop +/* 9A8ECC 80240ADC 00000000 */ nop /* 9A8ED0 80240AE0 080902FC */ j .L80240BF0 -/* 9A8ED4 80240AE4 00000000 */ nop +/* 9A8ED4 80240AE4 00000000 */ nop .L80240AE8: /* 9A8ED8 80240AE8 0280282D */ daddu $a1, $s4, $zero /* 9A8EDC 80240AEC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240844_9A8C34 /* 9A8EF4 80240B04 0C0125AE */ jal func_800496B8 /* 9A8EF8 80240B08 02A0302D */ daddu $a2, $s5, $zero /* 9A8EFC 80240B0C 080902FC */ j .L80240BF0 -/* 9A8F00 80240B10 00000000 */ nop +/* 9A8F00 80240B10 00000000 */ nop .L80240B14: /* 9A8F04 80240B14 0260202D */ daddu $a0, $s3, $zero /* 9A8F08 80240B18 0280282D */ daddu $a1, $s4, $zero -/* 9A8F0C 80240B1C 0C0126D1 */ jal func_80049B44 +/* 9A8F0C 80240B1C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9A8F10 80240B20 02A0302D */ daddu $a2, $s5, $zero /* 9A8F14 80240B24 8E230088 */ lw $v1, 0x88($s1) /* 9A8F18 80240B28 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240844_9A8C34 /* 9A8F74 80240B84 0C012701 */ jal func_80049C04 /* 9A8F78 80240B88 02A0302D */ daddu $a2, $s5, $zero /* 9A8F7C 80240B8C 080902FC */ j .L80240BF0 -/* 9A8F80 80240B90 00000000 */ nop +/* 9A8F80 80240B90 00000000 */ nop .L80240B94: /* 9A8F84 80240B94 0260202D */ daddu $a0, $s3, $zero /* 9A8F88 80240B98 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240844_9A8C34 /* 9A8F9C 80240BAC 0C09014B */ jal func_8024052C_9A891C /* 9A8FA0 80240BB0 02A0302D */ daddu $a2, $s5, $zero /* 9A8FA4 80240BB4 080902FC */ j .L80240BF0 -/* 9A8FA8 80240BB8 00000000 */ nop +/* 9A8FA8 80240BB8 00000000 */ nop .L80240BBC: /* 9A8FAC 80240BBC 0260202D */ daddu $a0, $s3, $zero /* 9A8FB0 80240BC0 0280282D */ daddu $a1, $s4, $zero /* 9A8FB4 80240BC4 0C090198 */ jal func_80240660_9A8A50 /* 9A8FB8 80240BC8 02A0302D */ daddu $a2, $s5, $zero /* 9A8FBC 80240BCC 080902FC */ j .L80240BF0 -/* 9A8FC0 80240BD0 00000000 */ nop +/* 9A8FC0 80240BD0 00000000 */ nop .L80240BD4: /* 9A8FC4 80240BD4 0280282D */ daddu $a1, $s4, $zero /* 9A8FC8 80240BD8 0C0901F1 */ jal func_802407C4_9A8BB4 /* 9A8FCC 80240BDC 02A0302D */ daddu $a2, $s5, $zero /* 9A8FD0 80240BE0 080902FC */ j .L80240BF0 -/* 9A8FD4 80240BE4 00000000 */ nop +/* 9A8FD4 80240BE4 00000000 */ nop .L80240BE8: /* 9A8FD8 80240BE8 0C0129CF */ jal func_8004A73C /* 9A8FDC 80240BEC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240844_9A8C34 /* 9A9030 80240C40 00220821 */ addu $at, $at, $v0 /* 9A9034 80240C44 8C225EE8 */ lw $v0, %lo(D_80245EE8)($at) /* 9A9038 80240C48 00400008 */ jr $v0 -/* 9A903C 80240C4C 00000000 */ nop +/* 9A903C 80240C4C 00000000 */ nop /* 9A9040 80240C50 8E420028 */ lw $v0, 0x28($s2) /* 9A9044 80240C54 24420001 */ addiu $v0, $v0, 1 /* 9A9048 80240C58 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0_9AA9E0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0_9AA9E0.s deleted file mode 100644 index 9e9f9cb230..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0_9AA9E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425F0_9AA9E0 -/* 9AA9E0 802425F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9AA9E4 802425F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 9AA9E8 802425F8 0080982D */ daddu $s3, $a0, $zero -/* 9AA9EC 802425FC AFBF0020 */ sw $ra, 0x20($sp) -/* 9AA9F0 80242600 AFB20018 */ sw $s2, 0x18($sp) -/* 9AA9F4 80242604 AFB10014 */ sw $s1, 0x14($sp) -/* 9AA9F8 80242608 AFB00010 */ sw $s0, 0x10($sp) -/* 9AA9FC 8024260C 8E720148 */ lw $s2, 0x148($s3) -/* 9AAA00 80242610 86440008 */ lh $a0, 8($s2) -/* 9AAA04 80242614 0C00EABB */ jal get_npc_unsafe -/* 9AAA08 80242618 00A0882D */ daddu $s1, $a1, $zero -/* 9AAA0C 8024261C 8E240008 */ lw $a0, 8($s1) -/* 9AAA10 80242620 0040802D */ daddu $s0, $v0, $zero -/* 9AAA14 80242624 00041FC2 */ srl $v1, $a0, 0x1f -/* 9AAA18 80242628 00832021 */ addu $a0, $a0, $v1 -/* 9AAA1C 8024262C 00042043 */ sra $a0, $a0, 1 -/* 9AAA20 80242630 0C00A67F */ jal rand_int -/* 9AAA24 80242634 24840001 */ addiu $a0, $a0, 1 -/* 9AAA28 80242638 8E230008 */ lw $v1, 8($s1) -/* 9AAA2C 8024263C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9AAA30 80242640 00032FC2 */ srl $a1, $v1, 0x1f -/* 9AAA34 80242644 00651821 */ addu $v1, $v1, $a1 -/* 9AAA38 80242648 00031843 */ sra $v1, $v1, 1 -/* 9AAA3C 8024264C 00621821 */ addu $v1, $v1, $v0 -/* 9AAA40 80242650 0C00A67F */ jal rand_int -/* 9AAA44 80242654 A603008E */ sh $v1, 0x8e($s0) -/* 9AAA48 80242658 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9AAA4C 8024265C 44820000 */ mtc1 $v0, $f0 -/* 9AAA50 80242660 00000000 */ nop -/* 9AAA54 80242664 46800020 */ cvt.s.w $f0, $f0 -/* 9AAA58 80242668 46006300 */ add.s $f12, $f12, $f0 -/* 9AAA5C 8024266C 3C0142B4 */ lui $at, 0x42b4 -/* 9AAA60 80242670 44810000 */ mtc1 $at, $f0 -/* 9AAA64 80242674 0C00A6C9 */ jal clamp_angle -/* 9AAA68 80242678 46006301 */ sub.s $f12, $f12, $f0 -/* 9AAA6C 8024267C E600000C */ swc1 $f0, 0xc($s0) -/* 9AAA70 80242680 8E4200CC */ lw $v0, 0xcc($s2) -/* 9AAA74 80242684 8C420000 */ lw $v0, ($v0) -/* 9AAA78 80242688 AE020028 */ sw $v0, 0x28($s0) -/* 9AAA7C 8024268C 24020003 */ addiu $v0, $zero, 3 -/* 9AAA80 80242690 AE620070 */ sw $v0, 0x70($s3) -/* 9AAA84 80242694 8FBF0020 */ lw $ra, 0x20($sp) -/* 9AAA88 80242698 8FB3001C */ lw $s3, 0x1c($sp) -/* 9AAA8C 8024269C 8FB20018 */ lw $s2, 0x18($sp) -/* 9AAA90 802426A0 8FB10014 */ lw $s1, 0x14($sp) -/* 9AAA94 802426A4 8FB00010 */ lw $s0, 0x10($sp) -/* 9AAA98 802426A8 03E00008 */ jr $ra -/* 9AAA9C 802426AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index 8620fe078c..465dea439d 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -54,7 +54,7 @@ glabel func_80243124_9AB514 /* 9AB5D4 802431E4 8E4300B0 */ lw $v1, 0xb0($s2) /* 9AB5D8 802431E8 30620004 */ andi $v0, $v1, 4 /* 9AB5DC 802431EC 10400007 */ beqz $v0, .L8024320C -/* 9AB5E0 802431F0 00000000 */ nop +/* 9AB5E0 802431F0 00000000 */ nop /* 9AB5E4 802431F4 824200B4 */ lb $v0, 0xb4($s2) /* 9AB5E8 802431F8 1440003C */ bnez $v0, .L802432EC /* 9AB5EC 802431FC 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_80243124_9AB514 /* 9AB610 80243220 00220821 */ addu $at, $at, $v0 /* 9AB614 80243224 8C226288 */ lw $v0, %lo(D_80246288)($at) /* 9AB618 80243228 00400008 */ jr $v0 -/* 9AB61C 8024322C 00000000 */ nop +/* 9AB61C 8024322C 00000000 */ nop /* 9AB620 80243230 0280202D */ daddu $a0, $s4, $zero /* 9AB624 80243234 0200282D */ daddu $a1, $s0, $zero /* 9AB628 80243238 0C090786 */ jal func_80241E18_9AA208 @@ -83,7 +83,7 @@ glabel func_80243124_9AB514 /* 9AB644 80243254 0000102D */ daddu $v0, $zero, $zero /* 9AB648 80243258 0280202D */ daddu $a0, $s4, $zero /* 9AB64C 8024325C 0200282D */ daddu $a1, $s0, $zero -/* 9AB650 80243260 0C09097C */ jal func_802425F0_9AA9E0 +/* 9AB650 80243260 0C09097C */ jal dup_trd_04_UnkNpcAIFunc1 /* 9AB654 80243264 0260302D */ daddu $a2, $s3, $zero /* 9AB658 80243268 0280202D */ daddu $a0, $s4, $zero /* 9AB65C 8024326C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index d2c1d96e96..05c1452920 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -57,7 +57,7 @@ glabel func_80243650_9ABA40 /* 9ABB0C 8024371C 8E4300B0 */ lw $v1, 0xb0($s2) /* 9ABB10 80243720 30620004 */ andi $v0, $v1, 4 /* 9ABB14 80243724 10400007 */ beqz $v0, .L80243744 -/* 9ABB18 80243728 00000000 */ nop +/* 9ABB18 80243728 00000000 */ nop /* 9ABB1C 8024372C 824200B4 */ lb $v0, 0xb4($s2) /* 9ABB20 80243730 14400052 */ bnez $v0, .L8024387C /* 9ABB24 80243734 0000102D */ daddu $v0, $zero, $zero @@ -73,7 +73,7 @@ glabel func_80243650_9ABA40 /* 9ABB48 80243758 00220821 */ addu $at, $at, $v0 /* 9ABB4C 8024375C 8C2262C8 */ lw $v0, %lo(D_802462C8)($at) /* 9ABB50 80243760 00400008 */ jr $v0 -/* 9ABB54 80243764 00000000 */ nop +/* 9ABB54 80243764 00000000 */ nop /* 9ABB58 80243768 0260202D */ daddu $a0, $s3, $zero /* 9ABB5C 8024376C 0200282D */ daddu $a1, $s0, $zero /* 9ABB60 80243770 0C090786 */ jal func_80241E18_9AA208 @@ -88,7 +88,7 @@ glabel func_80243650_9ABA40 /* 9ABB84 80243794 0000102D */ daddu $v0, $zero, $zero /* 9ABB88 80243798 0260202D */ daddu $a0, $s3, $zero /* 9ABB8C 8024379C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB90 802437A0 0C09097C */ jal func_802425F0_9AA9E0 +/* 9ABB90 802437A0 0C09097C */ jal dup_trd_04_UnkNpcAIFunc1 /* 9ABB94 802437A4 0280302D */ daddu $a2, $s4, $zero /* 9ABB98 802437A8 0260202D */ daddu $a0, $s3, $zero /* 9ABB9C 802437AC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s index 0a29b623b0..344a8a3303 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s @@ -55,7 +55,7 @@ glabel func_802406A4_9B7024 /* 9B70E8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* 9B70EC 8024076C 30420004 */ andi $v0, $v0, 4 /* 9B70F0 80240770 10400047 */ beqz $v0, .L80240890 -/* 9B70F4 80240774 00000000 */ nop +/* 9B70F4 80240774 00000000 */ nop .L80240778: /* 9B70F8 80240778 AE600070 */ sw $zero, 0x70($s3) /* 9B70FC 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_9B7024 /* 9B71A0 80240820 24020028 */ addiu $v0, $zero, 0x28 /* 9B71A4 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* 9B71A8 80240828 44833000 */ mtc1 $v1, $f6 -/* 9B71AC 8024082C 00000000 */ nop +/* 9B71AC 8024082C 00000000 */ nop /* 9B71B0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* 9B71B4 80240834 44073000 */ mfc1 $a3, $f6 /* 9B71B8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_9B7024 /* 9B7270 802408F0 10600015 */ beqz $v1, .L80240948 /* 9B7274 802408F4 0260202D */ daddu $a0, $s3, $zero /* 9B7278 802408F8 08090294 */ j .L80240A50 -/* 9B727C 802408FC 00000000 */ nop +/* 9B727C 802408FC 00000000 */ nop .L80240900: /* 9B7280 80240900 1062001C */ beq $v1, $v0, .L80240974 /* 9B7284 80240904 24020003 */ addiu $v0, $zero, 3 /* 9B7288 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* 9B728C 8024090C 0260202D */ daddu $a0, $s3, $zero /* 9B7290 80240910 08090294 */ j .L80240A50 -/* 9B7294 80240914 00000000 */ nop +/* 9B7294 80240914 00000000 */ nop .L80240918: /* 9B7298 80240918 2402000E */ addiu $v0, $zero, 0xe /* 9B729C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_9B7024 /* 9B72B0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* 9B72B4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* 9B72B8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* 9B72BC 8024093C 00000000 */ nop +/* 9B72BC 8024093C 00000000 */ nop /* 9B72C0 80240940 08090294 */ j .L80240A50 -/* 9B72C4 80240944 00000000 */ nop +/* 9B72C4 80240944 00000000 */ nop .L80240948: /* 9B72C8 80240948 0280282D */ daddu $a1, $s4, $zero /* 9B72CC 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_9B7024 /* 9B72E4 80240964 0C0125AE */ jal func_800496B8 /* 9B72E8 80240968 02A0302D */ daddu $a2, $s5, $zero /* 9B72EC 8024096C 08090294 */ j .L80240A50 -/* 9B72F0 80240970 00000000 */ nop +/* 9B72F0 80240970 00000000 */ nop .L80240974: /* 9B72F4 80240974 0260202D */ daddu $a0, $s3, $zero /* 9B72F8 80240978 0280282D */ daddu $a1, $s4, $zero -/* 9B72FC 8024097C 0C0126D1 */ jal func_80049B44 +/* 9B72FC 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9B7300 80240980 02A0302D */ daddu $a2, $s5, $zero /* 9B7304 80240984 8E230088 */ lw $v1, 0x88($s1) /* 9B7308 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_9B7024 /* 9B7364 802409E4 0C012701 */ jal func_80049C04 /* 9B7368 802409E8 02A0302D */ daddu $a2, $s5, $zero /* 9B736C 802409EC 08090294 */ j .L80240A50 -/* 9B7370 802409F0 00000000 */ nop +/* 9B7370 802409F0 00000000 */ nop .L802409F4: /* 9B7374 802409F4 0260202D */ daddu $a0, $s3, $zero /* 9B7378 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_9B7024 /* 9B738C 80240A0C 0C0900E3 */ jal func_8024038C_9B6D0C /* 9B7390 80240A10 02A0302D */ daddu $a2, $s5, $zero /* 9B7394 80240A14 08090294 */ j .L80240A50 -/* 9B7398 80240A18 00000000 */ nop +/* 9B7398 80240A18 00000000 */ nop .L80240A1C: /* 9B739C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* 9B73A0 80240A20 0280282D */ daddu $a1, $s4, $zero /* 9B73A4 80240A24 0C090130 */ jal func_802404C0_9B6E40 /* 9B73A8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* 9B73AC 80240A2C 08090294 */ j .L80240A50 -/* 9B73B0 80240A30 00000000 */ nop +/* 9B73B0 80240A30 00000000 */ nop .L80240A34: /* 9B73B4 80240A34 0280282D */ daddu $a1, $s4, $zero /* 9B73B8 80240A38 0C090189 */ jal func_80240624_9B6FA4 /* 9B73BC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* 9B73C0 80240A40 08090294 */ j .L80240A50 -/* 9B73C4 80240A44 00000000 */ nop +/* 9B73C4 80240A44 00000000 */ nop .L80240A48: /* 9B73C8 80240A48 0C0129CF */ jal func_8004A73C /* 9B73CC 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_9B7024 /* 9B7420 80240AA0 00220821 */ addu $at, $at, $v0 /* 9B7424 80240AA4 8C224828 */ lw $v0, %lo(D_80244828)($at) /* 9B7428 80240AA8 00400008 */ jr $v0 -/* 9B742C 80240AAC 00000000 */ nop +/* 9B742C 80240AAC 00000000 */ nop /* 9B7430 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* 9B7434 80240AB4 24420001 */ addiu $v0, $v0, 1 /* 9B7438 80240AB8 AE420028 */ sw $v0, 0x28($s2) diff --git a/src/battle/area_kmr_part_2/43A5A0.c b/src/battle/area_kmr_part_2/43A5A0.c index cbe64b2ee6..bfa29a35ae 100644 --- a/src/battle/area_kmr_part_2/43A5A0.c +++ b/src/battle/area_kmr_part_2/43A5A0.c @@ -2,8 +2,8 @@ #define NAMESPACE b_area_kmr_part_2 -INCLUDE_ASM(s32, "battle/area_kmr_part_2/43A5A0", func_80218B10_43A5A0); +#include "world/common/SomeMatrixOperations.inc.c" -INCLUDE_ASM(s32, "battle/area_kmr_part_2/43A5A0", func_80218B80_43A610); +// INCLUDE_ASM(s32, "battle/area_kmr_part_2/43A5A0", func_80218B10_43A5A0); -INCLUDE_ASM(s32, "battle/area_kmr_part_2/43A5A0", func_80218D50_43A7E0); +// INCLUDE_ASM(s32, "battle/area_kmr_part_2/43A5A0", func_80218B80_43A610); diff --git a/src/battle/area_kmr_part_2/43A7E0.c b/src/battle/area_kmr_part_2/43A7E0.c new file mode 100644 index 0000000000..f143e9d6c4 --- /dev/null +++ b/src/battle/area_kmr_part_2/43A7E0.c @@ -0,0 +1,5 @@ +#include "common.h" + +#define NAMESPACE b_area_kmr_part_2 + +INCLUDE_ASM(s32, "battle/area_kmr_part_2/43A7E0", func_80218D50_43A7E0); diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c index 8cafd4fc3c..d5af04c974 100644 --- a/src/code_20ec0_len_5040.c +++ b/src/code_20ec0_len_5040.c @@ -196,16 +196,8 @@ INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800495A0); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800496B8); -// Same as UnkNpcAIFunc1 -void func_80049B44(ScriptInstance* script, NpcAISettings* aiSettings) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); - npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); - npc->currentAnim = *enemy->animList; - script->functionTemp[0].s = 3; -} +#define NAMESPACE base +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049C04); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 2b2a996f15..d81b66f992 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -28,8 +28,9 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240E90_BE4640); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241040_BE47F0); -// should be #include "world/common/UnkNpcAIFunc1.inc.c", probably missing file split -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241668_BE4E18); +#define NAMESPACE dup_arn_04 +#include "world/common/UnkNpcAIFunc1.inc.c" +#define NAMESPACE arn_04 INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241728_BE4ED8); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index fea0889e57..dfee07ec34 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -48,8 +48,9 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024252C_BFFDAC); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242684_BFFF04); -// should be #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024292C_C001AC); +#define NAMESPACE dup_dgb_01 +#include "world/common/UnkNpcAIFunc1.inc.c" +#define NAMESPACE dgb_01 INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802429EC_C0026C); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 2629ca9cff..03a1512878 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -42,8 +42,9 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241760_C41510); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241910_C416C0); -// should be #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241F38_C41CE8); +#define NAMESPACE dup_dgb_08 +#include "world/common/UnkNpcAIFunc1.inc.c" +#define NAMESPACE dgb_08 INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241FF8_C41DA8); diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c index 5bfe4a002d..acd6307357 100644 --- a/src/world/area_dro/dro_01/95B200.c +++ b/src/world/area_dro/dro_01/95B200.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240034_95B234); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_8024023C_95B43C); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_802402E0_95B4E0); diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index 401b4ebda0..3d53ddb67a 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -18,6 +18,8 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" #define NAMESPACE dro_01 -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802437DC_95E9DC); +#define NAMESPACE dup_dro_01 +#include "world/common/SomeXYZFunc2.inc.c" +#define NAMESPACE dro_01 #include "world/common/SomeMatrixOperations.inc.c" diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index ce0756f03f..17b2ac1c65 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -10,6 +10,6 @@ INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240034_CBDD04); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_8024023C_CBDF0C); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_802402E0_CBDFB0); diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index e67e5fead3..37dd1046e1 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240034_E1E494); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_8024023C_E1E69C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 21569997fa..d6f00ab918 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240034_B34C04); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024023C_B34E0C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index 6ffcd6e156..e1831160cd 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240034_B65AE4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_8024023C_B65CEC); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index 96f691268a..ac945975c9 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_8024018C_B709EC); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240394_B70BF4); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240438_B70C98); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index a368d24022..cddf921b90 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240034_8B00A4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024023C_8B02AC); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802402E0_8B0350); diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index fe243ae6c2..5c41da9ffb 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240064_8EBE84); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_8024026C_8EC08C); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240310_8EC130); diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index eb825c1de8..de7ea1ecaa 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -18,7 +18,9 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" #define NAMESPACE kmr_20 -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802419BC_8ED7DC); +#define NAMESPACE dup_kmr_20 +#include "world/common/SomeXYZFunc2.inc.c" +#define NAMESPACE kmr_20 #define NAMESPACE dup3_kmr_20 #include "world/common/SomeMatrixOperations.inc.c" diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 031af84c96..a4ece5111d 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -18,7 +18,9 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84_8EDBA4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" #define NAMESPACE kmr_20 -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241F8C_8EDDAC); +#define NAMESPACE dup2_kmr_20 +#include "world/common/SomeXYZFunc2.inc.c" +#define NAMESPACE kmr_20 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242030_8EDE50); diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index 6f2f087176..f8f797cb77 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -37,7 +37,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_8024023C_7EAF4C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index ff2f0e06cf..97f8fbd6ed 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240034_8232F4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_8024023C_8234FC); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c index 78569879dc..9a77193fe9 100644 --- a/src/world/area_mac/mac_03/831800.c +++ b/src/world/area_mac/mac_03/831800.c @@ -10,6 +10,6 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240034_831834); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_8024023C_831A3C); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_802402E0_831AE0); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index af00f71f07..868e2451e9 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240034_E0E7D4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_8024023C_E0E9DC); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802402E0_E0EA80); diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index a90f1164ac..7d52557404 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240034_BB70A4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_8024023C_BB72AC); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 409d8efac5..6aaf8ab9af 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240034_9D7054); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_8024023C_9D725C); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 3285877b2d..254505fec4 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240034_A06F34); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024023C_A0713C); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802402E0_A071E0); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 3cdc4fc031..9f83082e18 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -48,8 +48,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241978_DBEC28); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241B28_DBEDD8); -// Should be #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242150_DBF400); +#define NAMESPACE dup_omo_07 +#include "world/common/UnkNpcAIFunc1.inc.c" +#define NAMESPACE omo_07 INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242210_DBF4C0); diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index b43a8c4430..edfbe8fedb 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240034_D05764); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_8024023C_D0596C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index ceaba9f648..072c0daac3 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240340_8697F0); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240548_8699F8); +#include "world/common/SomeXYZFunc2.inc.c" diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index ee2e8c1442..32a82846e2 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240034_86EB34); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_8024023C_86ED3C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index 0f5abf8aaa..7adb6fe97c 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240340_871D70); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240548_871F78); +#include "world/common/SomeXYZFunc2.inc.c" diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index 4404c60aae..9ee1d71ba2 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240034_876F14); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_8024023C_87711C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 95b98da098..3355229358 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240034_879C14); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024023C_879E1C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/Set8009A650_40.inc.c" diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 2c1727443b..c4d1f60472 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240034_87EE24); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_8024023C_87F02C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 2880ac298a..5f243bed33 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240034_8821F4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_8024023C_8823FC); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index 732f6ca0b3..77f08e87b0 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240034_888C04); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_8024023C_888E0C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index 1205d32945..e6034ef175 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240034_88D634); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_8024023C_88D83C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index fd103e056e..0ed22c8c94 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240034_88FBD4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_8024023C_88FDDC); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 6305b2254a..5008a94683 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240DA4_8937C4); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240FAC_8939CC); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index f8c8b26de8..2b717d182d 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240034_897614); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_8024023C_89781C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index 942ab4a0e8..585fed55a3 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -14,6 +14,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240340_89A690); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240548_89A898); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_802405EC_89A93C); diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index 45589ee433..d0df653ed5 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -14,6 +14,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240340_89DAE0); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240548_89DCE8); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_802405EC_89DD8C); diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index 46cdd187c2..13f624ea9a 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240370_8A0230); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240578_8A0438); +#include "world/common/SomeXYZFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024061C_8A04DC); diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index f45c92b886..81a4d4527d 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240034_8A2404); #include "world/common/GetCurrentCameraYawClamped180.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_8024023C_8A260C); +#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index edb3d35a87..5a437696d2 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -40,8 +40,9 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241E18_9AA208); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241FC8_9AA3B8); -// Should be #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802425F0_9AA9E0); +#define NAMESPACE dup_trd_04 +#include "world/common/UnkNpcAIFunc1.inc.c" +#define NAMESPACE trd_04 INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802426B0_9AAAA0); diff --git a/src/world/common/SomeXYZFunc2.inc.c b/src/world/common/SomeXYZFunc2.inc.c new file mode 100644 index 0000000000..0c4dcafc44 --- /dev/null +++ b/src/world/common/SomeXYZFunc2.inc.c @@ -0,0 +1,17 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(SomeXYZFunc2)(ScriptInstance* script, s32 isInitialStatus) { + PlayerStatus* playerStatus = PLAYER_STATUS; + f32 r = get_float_variable(script, *script->ptrReadPos); + f32 x = playerStatus->position.x; + f32 y = playerStatus->position.y; + f32 z = playerStatus->position.z; + + add_vec2D_polar(&x, &z, r, playerStatus->targetYaw); + set_float_variable(script, SI_VAR(0), x); + set_float_variable(script, SI_VAR(1), y); + set_float_variable(script, SI_VAR(2), z); + + return ApiStatus_DONE2; +} diff --git a/tools/assist.py b/tools/assist.py index 3d6a06813a..62783ed15c 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 import argparse -from collections import OrderedDict +from collections import Counter, OrderedDict import os import sys @@ -185,33 +185,28 @@ def do_query(query): def do_cross_query(): + ccount = Counter() clusters = [] - max_cluster = None - max_cluster_len = 0 for sym_name in map_syms: if not sym_name.startswith("_binary"): - sym = map_syms[sym_name] if get_symbol_length(sym_name) > 16: query_bytes = get_symbol_bytes(map_offsets, sym_name) + cluster_match = False for cluster in clusters: cluster_score = get_pair_score(query_bytes, cluster[0]) if cluster_score >= args.threshold: cluster.append(sym_name) + ccount[cluster[0]] += 1 cluster_match = True - if len(cluster) > max_cluster_len: - max_cluster_len = len(cluster) - max_cluster = cluster - - if len(cluster) % 10 == 0: - print("Cluster " + cluster[0] + " grew to size " + str(len(cluster))) + if len(cluster) % 10 == 0 and len(cluster) >= 50: + print(f"Cluster {cluster[0]} grew to size {len(cluster)}") break if not cluster_match: clusters.append([sym_name]) - # print("Adding cluster for " + sym_name) - print(max_cluster[0]) + print(ccount.most_common(100)) parser = argparse.ArgumentParser(description="Tools to assist with decomp") diff --git a/tools/splat.yaml b/tools/splat.yaml index 4091fe5888..2d7dfdef86 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -949,6 +949,7 @@ segments: files: - [0x439A90, c] - [0x43A5A0, c] + - [0x43A7E0, c] - [0x43AA50, c] - [0x43ACC0, c] - [0x43AF30, c]