diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241424_BE01B4.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241424_BE01B4.s deleted file mode 100644 index f9ed50d1c2..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241424_BE01B4.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241424_BE01B4 -/* BE01B4 80241424 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BE01B8 80241428 AFB10014 */ sw $s1, 0x14($sp) -/* BE01BC 8024142C 0080882D */ daddu $s1, $a0, $zero -/* BE01C0 80241430 AFBF0024 */ sw $ra, 0x24($sp) -/* BE01C4 80241434 AFB40020 */ sw $s4, 0x20($sp) -/* BE01C8 80241438 AFB3001C */ sw $s3, 0x1c($sp) -/* BE01CC 8024143C AFB20018 */ sw $s2, 0x18($sp) -/* BE01D0 80241440 AFB00010 */ sw $s0, 0x10($sp) -/* BE01D4 80241444 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* BE01D8 80241448 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* BE01DC 8024144C F7B80038 */ sdc1 $f24, 0x38($sp) -/* BE01E0 80241450 F7B60030 */ sdc1 $f22, 0x30($sp) -/* BE01E4 80241454 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BE01E8 80241458 8E30000C */ lw $s0, 0xc($s1) -/* BE01EC 8024145C 8E130000 */ lw $s3, ($s0) -/* BE01F0 80241460 26100004 */ addiu $s0, $s0, 4 -/* BE01F4 80241464 0C0B1EAF */ jal get_variable -/* BE01F8 80241468 0260282D */ daddu $a1, $s3, $zero -/* BE01FC 8024146C 4482E000 */ mtc1 $v0, $f28 -/* BE0200 80241470 00000000 */ nop -/* BE0204 80241474 4680E720 */ cvt.s.w $f28, $f28 -/* BE0208 80241478 8E140000 */ lw $s4, ($s0) -/* BE020C 8024147C 26100004 */ addiu $s0, $s0, 4 -/* BE0210 80241480 0220202D */ daddu $a0, $s1, $zero -/* BE0214 80241484 0C0B1EAF */ jal get_variable -/* BE0218 80241488 0280282D */ daddu $a1, $s4, $zero -/* BE021C 8024148C 4482D000 */ mtc1 $v0, $f26 -/* BE0220 80241490 00000000 */ nop -/* BE0224 80241494 4680D6A0 */ cvt.s.w $f26, $f26 -/* BE0228 80241498 8E100000 */ lw $s0, ($s0) -/* BE022C 8024149C 0220202D */ daddu $a0, $s1, $zero -/* BE0230 802414A0 0C0B1EAF */ jal get_variable -/* BE0234 802414A4 0200282D */ daddu $a1, $s0, $zero -/* BE0238 802414A8 4482C000 */ mtc1 $v0, $f24 -/* BE023C 802414AC 00000000 */ nop -/* BE0240 802414B0 4680C620 */ cvt.s.w $f24, $f24 -/* BE0244 802414B4 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* BE0248 802414B8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* BE024C 802414BC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BE0250 802414C0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BE0254 802414C4 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* BE0258 802414C8 44800000 */ mtc1 $zero, $f0 -/* BE025C 802414CC 00031080 */ sll $v0, $v1, 2 -/* BE0260 802414D0 00431021 */ addu $v0, $v0, $v1 -/* BE0264 802414D4 00021080 */ sll $v0, $v0, 2 -/* BE0268 802414D8 00431023 */ subu $v0, $v0, $v1 -/* BE026C 802414DC 000218C0 */ sll $v1, $v0, 3 -/* BE0270 802414E0 00431021 */ addu $v0, $v0, $v1 -/* BE0274 802414E4 000210C0 */ sll $v0, $v0, 3 -/* BE0278 802414E8 46001032 */ c.eq.s $f2, $f0 -/* BE027C 802414EC 3C01800B */ lui $at, 0x800b -/* BE0280 802414F0 00220821 */ addu $at, $at, $v0 -/* BE0284 802414F4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* BE0288 802414F8 45000005 */ bc1f .L80241510 -/* BE028C 802414FC 00000000 */ nop -/* BE0290 80241500 3C0142C8 */ lui $at, 0x42c8 -/* BE0294 80241504 44810000 */ mtc1 $at, $f0 -/* BE0298 80241508 08090548 */ j .L80241520 -/* BE029C 8024150C 4600B581 */ sub.s $f22, $f22, $f0 -.L80241510: -/* BE02A0 80241510 3C0142C8 */ lui $at, 0x42c8 -/* BE02A4 80241514 44810000 */ mtc1 $at, $f0 -/* BE02A8 80241518 00000000 */ nop -/* BE02AC 8024151C 4600B580 */ add.s $f22, $f22, $f0 -.L80241520: -/* BE02B0 80241520 0C00A6C9 */ jal clamp_angle -/* BE02B4 80241524 4600B306 */ mov.s $f12, $f22 -/* BE02B8 80241528 46000586 */ mov.s $f22, $f0 -/* BE02BC 8024152C 3C014170 */ lui $at, 0x4170 -/* BE02C0 80241530 4481A000 */ mtc1 $at, $f20 -/* BE02C4 80241534 0C00A8BB */ jal sin_deg -/* BE02C8 80241538 4600B306 */ mov.s $f12, $f22 -/* BE02CC 8024153C 46140002 */ mul.s $f0, $f0, $f20 -/* BE02D0 80241540 00000000 */ nop -/* BE02D4 80241544 864200B0 */ lh $v0, 0xb0($s2) -/* BE02D8 80241548 3C013F00 */ lui $at, 0x3f00 -/* BE02DC 8024154C 44812000 */ mtc1 $at, $f4 -/* BE02E0 80241550 44821000 */ mtc1 $v0, $f2 -/* BE02E4 80241554 00000000 */ nop -/* BE02E8 80241558 468010A0 */ cvt.s.w $f2, $f2 -/* BE02EC 8024155C 46041082 */ mul.s $f2, $f2, $f4 -/* BE02F0 80241560 00000000 */ nop -/* BE02F4 80241564 4600E700 */ add.s $f28, $f28, $f0 -/* BE02F8 80241568 4602D680 */ add.s $f26, $f26, $f2 -/* BE02FC 8024156C 0C00A8D4 */ jal cos_deg -/* BE0300 80241570 4600B306 */ mov.s $f12, $f22 -/* BE0304 80241574 46140002 */ mul.s $f0, $f0, $f20 -/* BE0308 80241578 00000000 */ nop -/* BE030C 8024157C 0220202D */ daddu $a0, $s1, $zero -/* BE0310 80241580 0260282D */ daddu $a1, $s3, $zero -/* BE0314 80241584 4600E18D */ trunc.w.s $f6, $f28 -/* BE0318 80241588 44063000 */ mfc1 $a2, $f6 -/* BE031C 8024158C 0C0B2026 */ jal set_variable -/* BE0320 80241590 4600C601 */ sub.s $f24, $f24, $f0 -/* BE0324 80241594 0220202D */ daddu $a0, $s1, $zero -/* BE0328 80241598 4600D18D */ trunc.w.s $f6, $f26 -/* BE032C 8024159C 44063000 */ mfc1 $a2, $f6 -/* BE0330 802415A0 0C0B2026 */ jal set_variable -/* BE0334 802415A4 0280282D */ daddu $a1, $s4, $zero -/* BE0338 802415A8 0220202D */ daddu $a0, $s1, $zero -/* BE033C 802415AC 4600C18D */ trunc.w.s $f6, $f24 -/* BE0340 802415B0 44063000 */ mfc1 $a2, $f6 -/* BE0344 802415B4 0C0B2026 */ jal set_variable -/* BE0348 802415B8 0200282D */ daddu $a1, $s0, $zero -/* BE034C 802415BC 8FBF0024 */ lw $ra, 0x24($sp) -/* BE0350 802415C0 8FB40020 */ lw $s4, 0x20($sp) -/* BE0354 802415C4 8FB3001C */ lw $s3, 0x1c($sp) -/* BE0358 802415C8 8FB20018 */ lw $s2, 0x18($sp) -/* BE035C 802415CC 8FB10014 */ lw $s1, 0x14($sp) -/* BE0360 802415D0 8FB00010 */ lw $s0, 0x10($sp) -/* BE0364 802415D4 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* BE0368 802415D8 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* BE036C 802415DC D7B80038 */ ldc1 $f24, 0x38($sp) -/* BE0370 802415E0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* BE0374 802415E4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BE0378 802415E8 24020002 */ addiu $v0, $zero, 2 -/* BE037C 802415EC 03E00008 */ jr $ra -/* BE0380 802415F0 27BD0050 */ addiu $sp, $sp, 0x50 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 76f7a85148..b3833a2dab 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 @@ -165,7 +165,7 @@ glabel func_8024061C_C2F1BC /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C2F42C 8024088C 00000000 */ nop -/* C2F430 80240890 0C09006D */ jal func_802401B4 +/* C2F430 80240890 0C09006D */ jal func_802401B4_C2ED54 /* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero /* C2F438 80240898 0809022A */ j .L802408A8 /* C2F43C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index b81ad641e5..255735c63a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -184,7 +184,7 @@ glabel func_802410D4_C2FC74 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC /* C2FF30 80241390 00000000 */ nop -/* C2FF34 80241394 0C09006D */ jal func_802401B4 +/* C2FF34 80241394 0C09006D */ jal func_802401B4_C2ED54 /* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero /* C2FF3C 8024139C 080904FF */ j .L802413FC /* C2FF40 802413A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index 0ca492763e..ec12ec6759 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -184,7 +184,7 @@ glabel func_80240E20_C3EA10 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 /* C3ECCC 802410DC 00000000 */ nop -/* C3ECD0 802410E0 0C09006D */ jal func_802401B4 +/* C3ECD0 802410E0 0C09006D */ jal func_802401B4_C3DDA4 /* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero /* C3ECD8 802410E8 08090452 */ j .L80241148 /* C3ECDC 802410EC 00000000 */ nop 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 60cfb6cd40..af1b5bd18f 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 @@ -165,7 +165,7 @@ glabel func_80241170_C3ED60 /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C3EFD0 802413E0 00000000 */ nop -/* C3EFD4 802413E4 0C09006D */ jal func_802401B4 +/* C3EFD4 802413E4 0C09006D */ jal func_802401B4_C3DDA4 /* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C3EFDC 802413EC 080904FF */ j .L802413FC /* C3EFE0 802413F0 00000000 */ nop 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 cdf817f5cc..ab427fe4a4 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 @@ -165,7 +165,7 @@ glabel func_8024061C_C471FC /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4746C 8024088C 00000000 */ nop -/* C47470 80240890 0C09006D */ jal func_802401B4 +/* C47470 80240890 0C09006D */ jal func_802401B4_C46D94 /* C47474 80240894 0240202D */ daddu $a0, $s2, $zero /* C47478 80240898 0809022A */ j .L802408A8 /* C4747C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index d5de70e4a1..d5319c9e41 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -184,7 +184,7 @@ glabel func_802410D4_C47CB4 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC /* C47F70 80241390 00000000 */ nop -/* C47F74 80241394 0C09006D */ jal func_802401B4 +/* C47F74 80241394 0C09006D */ jal func_802401B4_C46D94 /* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero /* C47F7C 8024139C 080904FF */ j .L802413FC /* C47F80 802413A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s index 786d788b63..c5b83826d3 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s @@ -132,7 +132,7 @@ glabel func_80243578_C4A158 /* C4A34C 8024376C 00000000 */ nop /* C4A350 80243770 0280202D */ daddu $a0, $s4, $zero /* C4A354 80243774 0220282D */ daddu $a1, $s1, $zero -/* C4A358 80243778 0C090C3C */ jal func_802430F0 +/* C4A358 80243778 0C090C3C */ jal func_802430F0_C49CD0 /* C4A35C 8024377C 0260302D */ daddu $a2, $s3, $zero /* C4A360 80243780 08090DF0 */ j .L802437C0 /* C4A364 80243784 00000000 */ nop 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 1a1a4cb273..2d20ab7a74 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 @@ -165,7 +165,7 @@ glabel func_8024061C_C4FB2C /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4FD9C 8024088C 00000000 */ nop -/* C4FDA0 80240890 0C09006D */ jal func_802401B4 +/* C4FDA0 80240890 0C09006D */ jal func_802401B4_C4F6C4 /* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero /* C4FDA8 80240898 0809022A */ j .L802408A8 /* C4FDAC 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index 9bb74e3282..f93f0e1f82 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -184,7 +184,7 @@ glabel func_80240E20_C53360 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 /* C5361C 802410DC 00000000 */ nop -/* C53620 802410E0 0C09006D */ jal func_802401B4 +/* C53620 802410E0 0C09006D */ jal func_802401B4_C526F4 /* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero /* C53628 802410E8 08090452 */ j .L80241148 /* C5362C 802410EC 00000000 */ nop 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 3ce6b44d09..3f17a85492 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 @@ -165,7 +165,7 @@ glabel func_80241170_C536B0 /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C53920 802413E0 00000000 */ nop -/* C53924 802413E4 0C09006D */ jal func_802401B4 +/* C53924 802413E4 0C09006D */ jal func_802401B4_C526F4 /* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero /* C5392C 802413EC 080904FF */ j .L802413FC /* C53930 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242560.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242560.s deleted file mode 100644 index 9f5b37fc10..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242560.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242560 -/* 95D760 80242560 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 95D764 80242564 AFB10014 */ sw $s1, 0x14($sp) -/* 95D768 80242568 0080882D */ daddu $s1, $a0, $zero -/* 95D76C 8024256C AFBF0024 */ sw $ra, 0x24($sp) -/* 95D770 80242570 AFB40020 */ sw $s4, 0x20($sp) -/* 95D774 80242574 AFB3001C */ sw $s3, 0x1c($sp) -/* 95D778 80242578 AFB20018 */ sw $s2, 0x18($sp) -/* 95D77C 8024257C AFB00010 */ sw $s0, 0x10($sp) -/* 95D780 80242580 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 95D784 80242584 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 95D788 80242588 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 95D78C 8024258C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 95D790 80242590 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 95D794 80242594 8E30000C */ lw $s0, 0xc($s1) -/* 95D798 80242598 8E130000 */ lw $s3, ($s0) -/* 95D79C 8024259C 26100004 */ addiu $s0, $s0, 4 -/* 95D7A0 802425A0 0C0B1EAF */ jal get_variable -/* 95D7A4 802425A4 0260282D */ daddu $a1, $s3, $zero -/* 95D7A8 802425A8 4482E000 */ mtc1 $v0, $f28 -/* 95D7AC 802425AC 00000000 */ nop -/* 95D7B0 802425B0 4680E720 */ cvt.s.w $f28, $f28 -/* 95D7B4 802425B4 8E140000 */ lw $s4, ($s0) -/* 95D7B8 802425B8 26100004 */ addiu $s0, $s0, 4 -/* 95D7BC 802425BC 0220202D */ daddu $a0, $s1, $zero -/* 95D7C0 802425C0 0C0B1EAF */ jal get_variable -/* 95D7C4 802425C4 0280282D */ daddu $a1, $s4, $zero -/* 95D7C8 802425C8 4482D000 */ mtc1 $v0, $f26 -/* 95D7CC 802425CC 00000000 */ nop -/* 95D7D0 802425D0 4680D6A0 */ cvt.s.w $f26, $f26 -/* 95D7D4 802425D4 8E100000 */ lw $s0, ($s0) -/* 95D7D8 802425D8 0220202D */ daddu $a0, $s1, $zero -/* 95D7DC 802425DC 0C0B1EAF */ jal get_variable -/* 95D7E0 802425E0 0200282D */ daddu $a1, $s0, $zero -/* 95D7E4 802425E4 4482C000 */ mtc1 $v0, $f24 -/* 95D7E8 802425E8 00000000 */ nop -/* 95D7EC 802425EC 4680C620 */ cvt.s.w $f24, $f24 -/* 95D7F0 802425F0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 95D7F4 802425F4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 95D7F8 802425F8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 95D7FC 802425FC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 95D800 80242600 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 95D804 80242604 44800000 */ mtc1 $zero, $f0 -/* 95D808 80242608 00031080 */ sll $v0, $v1, 2 -/* 95D80C 8024260C 00431021 */ addu $v0, $v0, $v1 -/* 95D810 80242610 00021080 */ sll $v0, $v0, 2 -/* 95D814 80242614 00431023 */ subu $v0, $v0, $v1 -/* 95D818 80242618 000218C0 */ sll $v1, $v0, 3 -/* 95D81C 8024261C 00431021 */ addu $v0, $v0, $v1 -/* 95D820 80242620 000210C0 */ sll $v0, $v0, 3 -/* 95D824 80242624 46001032 */ c.eq.s $f2, $f0 -/* 95D828 80242628 3C01800B */ lui $at, 0x800b -/* 95D82C 8024262C 00220821 */ addu $at, $at, $v0 -/* 95D830 80242630 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 95D834 80242634 45000005 */ bc1f .L8024264C -/* 95D838 80242638 00000000 */ nop -/* 95D83C 8024263C 3C0142C8 */ lui $at, 0x42c8 -/* 95D840 80242640 44810000 */ mtc1 $at, $f0 -/* 95D844 80242644 08090997 */ j .L8024265C -/* 95D848 80242648 4600B581 */ sub.s $f22, $f22, $f0 -.L8024264C: -/* 95D84C 8024264C 3C0142C8 */ lui $at, 0x42c8 -/* 95D850 80242650 44810000 */ mtc1 $at, $f0 -/* 95D854 80242654 00000000 */ nop -/* 95D858 80242658 4600B580 */ add.s $f22, $f22, $f0 -.L8024265C: -/* 95D85C 8024265C 0C00A6C9 */ jal clamp_angle -/* 95D860 80242660 4600B306 */ mov.s $f12, $f22 -/* 95D864 80242664 46000586 */ mov.s $f22, $f0 -/* 95D868 80242668 3C014170 */ lui $at, 0x4170 -/* 95D86C 8024266C 4481A000 */ mtc1 $at, $f20 -/* 95D870 80242670 0C00A8BB */ jal sin_deg -/* 95D874 80242674 4600B306 */ mov.s $f12, $f22 -/* 95D878 80242678 46140002 */ mul.s $f0, $f0, $f20 -/* 95D87C 8024267C 00000000 */ nop -/* 95D880 80242680 864200B0 */ lh $v0, 0xb0($s2) -/* 95D884 80242684 3C013F00 */ lui $at, 0x3f00 -/* 95D888 80242688 44812000 */ mtc1 $at, $f4 -/* 95D88C 8024268C 44821000 */ mtc1 $v0, $f2 -/* 95D890 80242690 00000000 */ nop -/* 95D894 80242694 468010A0 */ cvt.s.w $f2, $f2 -/* 95D898 80242698 46041082 */ mul.s $f2, $f2, $f4 -/* 95D89C 8024269C 00000000 */ nop -/* 95D8A0 802426A0 4600E700 */ add.s $f28, $f28, $f0 -/* 95D8A4 802426A4 4602D680 */ add.s $f26, $f26, $f2 -/* 95D8A8 802426A8 0C00A8D4 */ jal cos_deg -/* 95D8AC 802426AC 4600B306 */ mov.s $f12, $f22 -/* 95D8B0 802426B0 46140002 */ mul.s $f0, $f0, $f20 -/* 95D8B4 802426B4 00000000 */ nop -/* 95D8B8 802426B8 0220202D */ daddu $a0, $s1, $zero -/* 95D8BC 802426BC 0260282D */ daddu $a1, $s3, $zero -/* 95D8C0 802426C0 4600E18D */ trunc.w.s $f6, $f28 -/* 95D8C4 802426C4 44063000 */ mfc1 $a2, $f6 -/* 95D8C8 802426C8 0C0B2026 */ jal set_variable -/* 95D8CC 802426CC 4600C601 */ sub.s $f24, $f24, $f0 -/* 95D8D0 802426D0 0220202D */ daddu $a0, $s1, $zero -/* 95D8D4 802426D4 4600D18D */ trunc.w.s $f6, $f26 -/* 95D8D8 802426D8 44063000 */ mfc1 $a2, $f6 -/* 95D8DC 802426DC 0C0B2026 */ jal set_variable -/* 95D8E0 802426E0 0280282D */ daddu $a1, $s4, $zero -/* 95D8E4 802426E4 0220202D */ daddu $a0, $s1, $zero -/* 95D8E8 802426E8 4600C18D */ trunc.w.s $f6, $f24 -/* 95D8EC 802426EC 44063000 */ mfc1 $a2, $f6 -/* 95D8F0 802426F0 0C0B2026 */ jal set_variable -/* 95D8F4 802426F4 0200282D */ daddu $a1, $s0, $zero -/* 95D8F8 802426F8 8FBF0024 */ lw $ra, 0x24($sp) -/* 95D8FC 802426FC 8FB40020 */ lw $s4, 0x20($sp) -/* 95D900 80242700 8FB3001C */ lw $s3, 0x1c($sp) -/* 95D904 80242704 8FB20018 */ lw $s2, 0x18($sp) -/* 95D908 80242708 8FB10014 */ lw $s1, 0x14($sp) -/* 95D90C 8024270C 8FB00010 */ lw $s0, 0x10($sp) -/* 95D910 80242710 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 95D914 80242714 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 95D918 80242718 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 95D91C 8024271C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 95D920 80242720 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 95D924 80242724 24020002 */ addiu $v0, $zero, 2 -/* 95D928 80242728 03E00008 */ jr $ra -/* 95D92C 8024272C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802430F0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802430F0.s deleted file mode 100644 index a4dcb7a566..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802430F0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430F0 -/* 96C2B0 802430F0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 96C2B4 802430F4 AFB10014 */ sw $s1, 0x14($sp) -/* 96C2B8 802430F8 0080882D */ daddu $s1, $a0, $zero -/* 96C2BC 802430FC AFBF0024 */ sw $ra, 0x24($sp) -/* 96C2C0 80243100 AFB40020 */ sw $s4, 0x20($sp) -/* 96C2C4 80243104 AFB3001C */ sw $s3, 0x1c($sp) -/* 96C2C8 80243108 AFB20018 */ sw $s2, 0x18($sp) -/* 96C2CC 8024310C AFB00010 */ sw $s0, 0x10($sp) -/* 96C2D0 80243110 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 96C2D4 80243114 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 96C2D8 80243118 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 96C2DC 8024311C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 96C2E0 80243120 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 96C2E4 80243124 8E30000C */ lw $s0, 0xc($s1) -/* 96C2E8 80243128 8E130000 */ lw $s3, ($s0) -/* 96C2EC 8024312C 26100004 */ addiu $s0, $s0, 4 -/* 96C2F0 80243130 0C0B1EAF */ jal get_variable -/* 96C2F4 80243134 0260282D */ daddu $a1, $s3, $zero -/* 96C2F8 80243138 4482E000 */ mtc1 $v0, $f28 -/* 96C2FC 8024313C 00000000 */ nop -/* 96C300 80243140 4680E720 */ cvt.s.w $f28, $f28 -/* 96C304 80243144 8E140000 */ lw $s4, ($s0) -/* 96C308 80243148 26100004 */ addiu $s0, $s0, 4 -/* 96C30C 8024314C 0220202D */ daddu $a0, $s1, $zero -/* 96C310 80243150 0C0B1EAF */ jal get_variable -/* 96C314 80243154 0280282D */ daddu $a1, $s4, $zero -/* 96C318 80243158 4482D000 */ mtc1 $v0, $f26 -/* 96C31C 8024315C 00000000 */ nop -/* 96C320 80243160 4680D6A0 */ cvt.s.w $f26, $f26 -/* 96C324 80243164 8E100000 */ lw $s0, ($s0) -/* 96C328 80243168 0220202D */ daddu $a0, $s1, $zero -/* 96C32C 8024316C 0C0B1EAF */ jal get_variable -/* 96C330 80243170 0200282D */ daddu $a1, $s0, $zero -/* 96C334 80243174 4482C000 */ mtc1 $v0, $f24 -/* 96C338 80243178 00000000 */ nop -/* 96C33C 8024317C 4680C620 */ cvt.s.w $f24, $f24 -/* 96C340 80243180 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 96C344 80243184 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 96C348 80243188 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 96C34C 8024318C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 96C350 80243190 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 96C354 80243194 44800000 */ mtc1 $zero, $f0 -/* 96C358 80243198 00031080 */ sll $v0, $v1, 2 -/* 96C35C 8024319C 00431021 */ addu $v0, $v0, $v1 -/* 96C360 802431A0 00021080 */ sll $v0, $v0, 2 -/* 96C364 802431A4 00431023 */ subu $v0, $v0, $v1 -/* 96C368 802431A8 000218C0 */ sll $v1, $v0, 3 -/* 96C36C 802431AC 00431021 */ addu $v0, $v0, $v1 -/* 96C370 802431B0 000210C0 */ sll $v0, $v0, 3 -/* 96C374 802431B4 46001032 */ c.eq.s $f2, $f0 -/* 96C378 802431B8 3C01800B */ lui $at, 0x800b -/* 96C37C 802431BC 00220821 */ addu $at, $at, $v0 -/* 96C380 802431C0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 96C384 802431C4 45000005 */ bc1f .L802431DC -/* 96C388 802431C8 00000000 */ nop -/* 96C38C 802431CC 3C0142C8 */ lui $at, 0x42c8 -/* 96C390 802431D0 44810000 */ mtc1 $at, $f0 -/* 96C394 802431D4 08090C7B */ j .L802431EC -/* 96C398 802431D8 4600B581 */ sub.s $f22, $f22, $f0 -.L802431DC: -/* 96C39C 802431DC 3C0142C8 */ lui $at, 0x42c8 -/* 96C3A0 802431E0 44810000 */ mtc1 $at, $f0 -/* 96C3A4 802431E4 00000000 */ nop -/* 96C3A8 802431E8 4600B580 */ add.s $f22, $f22, $f0 -.L802431EC: -/* 96C3AC 802431EC 0C00A6C9 */ jal clamp_angle -/* 96C3B0 802431F0 4600B306 */ mov.s $f12, $f22 -/* 96C3B4 802431F4 46000586 */ mov.s $f22, $f0 -/* 96C3B8 802431F8 3C014170 */ lui $at, 0x4170 -/* 96C3BC 802431FC 4481A000 */ mtc1 $at, $f20 -/* 96C3C0 80243200 0C00A8BB */ jal sin_deg -/* 96C3C4 80243204 4600B306 */ mov.s $f12, $f22 -/* 96C3C8 80243208 46140002 */ mul.s $f0, $f0, $f20 -/* 96C3CC 8024320C 00000000 */ nop -/* 96C3D0 80243210 864200B0 */ lh $v0, 0xb0($s2) -/* 96C3D4 80243214 3C013F00 */ lui $at, 0x3f00 -/* 96C3D8 80243218 44812000 */ mtc1 $at, $f4 -/* 96C3DC 8024321C 44821000 */ mtc1 $v0, $f2 -/* 96C3E0 80243220 00000000 */ nop -/* 96C3E4 80243224 468010A0 */ cvt.s.w $f2, $f2 -/* 96C3E8 80243228 46041082 */ mul.s $f2, $f2, $f4 -/* 96C3EC 8024322C 00000000 */ nop -/* 96C3F0 80243230 4600E700 */ add.s $f28, $f28, $f0 -/* 96C3F4 80243234 4602D680 */ add.s $f26, $f26, $f2 -/* 96C3F8 80243238 0C00A8D4 */ jal cos_deg -/* 96C3FC 8024323C 4600B306 */ mov.s $f12, $f22 -/* 96C400 80243240 46140002 */ mul.s $f0, $f0, $f20 -/* 96C404 80243244 00000000 */ nop -/* 96C408 80243248 0220202D */ daddu $a0, $s1, $zero -/* 96C40C 8024324C 0260282D */ daddu $a1, $s3, $zero -/* 96C410 80243250 4600E18D */ trunc.w.s $f6, $f28 -/* 96C414 80243254 44063000 */ mfc1 $a2, $f6 -/* 96C418 80243258 0C0B2026 */ jal set_variable -/* 96C41C 8024325C 4600C601 */ sub.s $f24, $f24, $f0 -/* 96C420 80243260 0220202D */ daddu $a0, $s1, $zero -/* 96C424 80243264 4600D18D */ trunc.w.s $f6, $f26 -/* 96C428 80243268 44063000 */ mfc1 $a2, $f6 -/* 96C42C 8024326C 0C0B2026 */ jal set_variable -/* 96C430 80243270 0280282D */ daddu $a1, $s4, $zero -/* 96C434 80243274 0220202D */ daddu $a0, $s1, $zero -/* 96C438 80243278 4600C18D */ trunc.w.s $f6, $f24 -/* 96C43C 8024327C 44063000 */ mfc1 $a2, $f6 -/* 96C440 80243280 0C0B2026 */ jal set_variable -/* 96C444 80243284 0200282D */ daddu $a1, $s0, $zero -/* 96C448 80243288 8FBF0024 */ lw $ra, 0x24($sp) -/* 96C44C 8024328C 8FB40020 */ lw $s4, 0x20($sp) -/* 96C450 80243290 8FB3001C */ lw $s3, 0x1c($sp) -/* 96C454 80243294 8FB20018 */ lw $s2, 0x18($sp) -/* 96C458 80243298 8FB10014 */ lw $s1, 0x14($sp) -/* 96C45C 8024329C 8FB00010 */ lw $s0, 0x10($sp) -/* 96C460 802432A0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 96C464 802432A4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 96C468 802432A8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 96C46C 802432AC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 96C470 802432B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 96C474 802432B4 24020002 */ addiu $v0, $zero, 2 -/* 96C478 802432B8 03E00008 */ jr $ra -/* 96C47C 802432BC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802417A0_CB04E0.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802417A0_CB04E0.s deleted file mode 100644 index 937e8173ab..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802417A0_CB04E0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A0_CB04E0 -/* CB04E0 802417A0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CB04E4 802417A4 AFB10014 */ sw $s1, 0x14($sp) -/* CB04E8 802417A8 0080882D */ daddu $s1, $a0, $zero -/* CB04EC 802417AC AFBF0024 */ sw $ra, 0x24($sp) -/* CB04F0 802417B0 AFB40020 */ sw $s4, 0x20($sp) -/* CB04F4 802417B4 AFB3001C */ sw $s3, 0x1c($sp) -/* CB04F8 802417B8 AFB20018 */ sw $s2, 0x18($sp) -/* CB04FC 802417BC AFB00010 */ sw $s0, 0x10($sp) -/* CB0500 802417C0 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CB0504 802417C4 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CB0508 802417C8 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CB050C 802417CC F7B60030 */ sdc1 $f22, 0x30($sp) -/* CB0510 802417D0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CB0514 802417D4 8E30000C */ lw $s0, 0xc($s1) -/* CB0518 802417D8 8E130000 */ lw $s3, ($s0) -/* CB051C 802417DC 26100004 */ addiu $s0, $s0, 4 -/* CB0520 802417E0 0C0B1EAF */ jal get_variable -/* CB0524 802417E4 0260282D */ daddu $a1, $s3, $zero -/* CB0528 802417E8 4482E000 */ mtc1 $v0, $f28 -/* CB052C 802417EC 00000000 */ nop -/* CB0530 802417F0 4680E720 */ cvt.s.w $f28, $f28 -/* CB0534 802417F4 8E140000 */ lw $s4, ($s0) -/* CB0538 802417F8 26100004 */ addiu $s0, $s0, 4 -/* CB053C 802417FC 0220202D */ daddu $a0, $s1, $zero -/* CB0540 80241800 0C0B1EAF */ jal get_variable -/* CB0544 80241804 0280282D */ daddu $a1, $s4, $zero -/* CB0548 80241808 4482D000 */ mtc1 $v0, $f26 -/* CB054C 8024180C 00000000 */ nop -/* CB0550 80241810 4680D6A0 */ cvt.s.w $f26, $f26 -/* CB0554 80241814 8E100000 */ lw $s0, ($s0) -/* CB0558 80241818 0220202D */ daddu $a0, $s1, $zero -/* CB055C 8024181C 0C0B1EAF */ jal get_variable -/* CB0560 80241820 0200282D */ daddu $a1, $s0, $zero -/* CB0564 80241824 4482C000 */ mtc1 $v0, $f24 -/* CB0568 80241828 00000000 */ nop -/* CB056C 8024182C 4680C620 */ cvt.s.w $f24, $f24 -/* CB0570 80241830 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CB0574 80241834 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CB0578 80241838 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CB057C 8024183C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CB0580 80241840 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CB0584 80241844 44800000 */ mtc1 $zero, $f0 -/* CB0588 80241848 00031080 */ sll $v0, $v1, 2 -/* CB058C 8024184C 00431021 */ addu $v0, $v0, $v1 -/* CB0590 80241850 00021080 */ sll $v0, $v0, 2 -/* CB0594 80241854 00431023 */ subu $v0, $v0, $v1 -/* CB0598 80241858 000218C0 */ sll $v1, $v0, 3 -/* CB059C 8024185C 00431021 */ addu $v0, $v0, $v1 -/* CB05A0 80241860 000210C0 */ sll $v0, $v0, 3 -/* CB05A4 80241864 46001032 */ c.eq.s $f2, $f0 -/* CB05A8 80241868 3C01800B */ lui $at, 0x800b -/* CB05AC 8024186C 00220821 */ addu $at, $at, $v0 -/* CB05B0 80241870 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CB05B4 80241874 45000005 */ bc1f .L8024188C -/* CB05B8 80241878 00000000 */ nop -/* CB05BC 8024187C 3C0142C8 */ lui $at, 0x42c8 -/* CB05C0 80241880 44810000 */ mtc1 $at, $f0 -/* CB05C4 80241884 08090627 */ j .L8024189C -/* CB05C8 80241888 4600B581 */ sub.s $f22, $f22, $f0 -.L8024188C: -/* CB05CC 8024188C 3C0142C8 */ lui $at, 0x42c8 -/* CB05D0 80241890 44810000 */ mtc1 $at, $f0 -/* CB05D4 80241894 00000000 */ nop -/* CB05D8 80241898 4600B580 */ add.s $f22, $f22, $f0 -.L8024189C: -/* CB05DC 8024189C 0C00A6C9 */ jal clamp_angle -/* CB05E0 802418A0 4600B306 */ mov.s $f12, $f22 -/* CB05E4 802418A4 46000586 */ mov.s $f22, $f0 -/* CB05E8 802418A8 3C014170 */ lui $at, 0x4170 -/* CB05EC 802418AC 4481A000 */ mtc1 $at, $f20 -/* CB05F0 802418B0 0C00A8BB */ jal sin_deg -/* CB05F4 802418B4 4600B306 */ mov.s $f12, $f22 -/* CB05F8 802418B8 46140002 */ mul.s $f0, $f0, $f20 -/* CB05FC 802418BC 00000000 */ nop -/* CB0600 802418C0 864200B0 */ lh $v0, 0xb0($s2) -/* CB0604 802418C4 3C013F00 */ lui $at, 0x3f00 -/* CB0608 802418C8 44812000 */ mtc1 $at, $f4 -/* CB060C 802418CC 44821000 */ mtc1 $v0, $f2 -/* CB0610 802418D0 00000000 */ nop -/* CB0614 802418D4 468010A0 */ cvt.s.w $f2, $f2 -/* CB0618 802418D8 46041082 */ mul.s $f2, $f2, $f4 -/* CB061C 802418DC 00000000 */ nop -/* CB0620 802418E0 4600E700 */ add.s $f28, $f28, $f0 -/* CB0624 802418E4 4602D680 */ add.s $f26, $f26, $f2 -/* CB0628 802418E8 0C00A8D4 */ jal cos_deg -/* CB062C 802418EC 4600B306 */ mov.s $f12, $f22 -/* CB0630 802418F0 46140002 */ mul.s $f0, $f0, $f20 -/* CB0634 802418F4 00000000 */ nop -/* CB0638 802418F8 0220202D */ daddu $a0, $s1, $zero -/* CB063C 802418FC 0260282D */ daddu $a1, $s3, $zero -/* CB0640 80241900 4600E18D */ trunc.w.s $f6, $f28 -/* CB0644 80241904 44063000 */ mfc1 $a2, $f6 -/* CB0648 80241908 0C0B2026 */ jal set_variable -/* CB064C 8024190C 4600C601 */ sub.s $f24, $f24, $f0 -/* CB0650 80241910 0220202D */ daddu $a0, $s1, $zero -/* CB0654 80241914 4600D18D */ trunc.w.s $f6, $f26 -/* CB0658 80241918 44063000 */ mfc1 $a2, $f6 -/* CB065C 8024191C 0C0B2026 */ jal set_variable -/* CB0660 80241920 0280282D */ daddu $a1, $s4, $zero -/* CB0664 80241924 0220202D */ daddu $a0, $s1, $zero -/* CB0668 80241928 4600C18D */ trunc.w.s $f6, $f24 -/* CB066C 8024192C 44063000 */ mfc1 $a2, $f6 -/* CB0670 80241930 0C0B2026 */ jal set_variable -/* CB0674 80241934 0200282D */ daddu $a1, $s0, $zero -/* CB0678 80241938 8FBF0024 */ lw $ra, 0x24($sp) -/* CB067C 8024193C 8FB40020 */ lw $s4, 0x20($sp) -/* CB0680 80241940 8FB3001C */ lw $s3, 0x1c($sp) -/* CB0684 80241944 8FB20018 */ lw $s2, 0x18($sp) -/* CB0688 80241948 8FB10014 */ lw $s1, 0x14($sp) -/* CB068C 8024194C 8FB00010 */ lw $s0, 0x10($sp) -/* CB0690 80241950 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CB0694 80241954 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CB0698 80241958 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CB069C 8024195C D7B60030 */ ldc1 $f22, 0x30($sp) -/* CB06A0 80241960 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CB06A4 80241964 24020002 */ addiu $v0, $zero, 2 -/* CB06A8 80241968 03E00008 */ jr $ra -/* CB06AC 8024196C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802403F0_CC1220.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802403F0_CC1220.s deleted file mode 100644 index 52c385e539..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802403F0_CC1220.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_CC1220 -/* CC1220 802403F0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CC1224 802403F4 AFB10014 */ sw $s1, 0x14($sp) -/* CC1228 802403F8 0080882D */ daddu $s1, $a0, $zero -/* CC122C 802403FC AFBF0024 */ sw $ra, 0x24($sp) -/* CC1230 80240400 AFB40020 */ sw $s4, 0x20($sp) -/* CC1234 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* CC1238 80240408 AFB20018 */ sw $s2, 0x18($sp) -/* CC123C 8024040C AFB00010 */ sw $s0, 0x10($sp) -/* CC1240 80240410 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CC1244 80240414 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CC1248 80240418 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CC124C 8024041C F7B60030 */ sdc1 $f22, 0x30($sp) -/* CC1250 80240420 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CC1254 80240424 8E30000C */ lw $s0, 0xc($s1) -/* CC1258 80240428 8E130000 */ lw $s3, ($s0) -/* CC125C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* CC1260 80240430 0C0B1EAF */ jal get_variable -/* CC1264 80240434 0260282D */ daddu $a1, $s3, $zero -/* CC1268 80240438 4482E000 */ mtc1 $v0, $f28 -/* CC126C 8024043C 00000000 */ nop -/* CC1270 80240440 4680E720 */ cvt.s.w $f28, $f28 -/* CC1274 80240444 8E140000 */ lw $s4, ($s0) -/* CC1278 80240448 26100004 */ addiu $s0, $s0, 4 -/* CC127C 8024044C 0220202D */ daddu $a0, $s1, $zero -/* CC1280 80240450 0C0B1EAF */ jal get_variable -/* CC1284 80240454 0280282D */ daddu $a1, $s4, $zero -/* CC1288 80240458 4482D000 */ mtc1 $v0, $f26 -/* CC128C 8024045C 00000000 */ nop -/* CC1290 80240460 4680D6A0 */ cvt.s.w $f26, $f26 -/* CC1294 80240464 8E100000 */ lw $s0, ($s0) -/* CC1298 80240468 0220202D */ daddu $a0, $s1, $zero -/* CC129C 8024046C 0C0B1EAF */ jal get_variable -/* CC12A0 80240470 0200282D */ daddu $a1, $s0, $zero -/* CC12A4 80240474 4482C000 */ mtc1 $v0, $f24 -/* CC12A8 80240478 00000000 */ nop -/* CC12AC 8024047C 4680C620 */ cvt.s.w $f24, $f24 -/* CC12B0 80240480 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CC12B4 80240484 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CC12B8 80240488 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CC12BC 8024048C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CC12C0 80240490 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CC12C4 80240494 44800000 */ mtc1 $zero, $f0 -/* CC12C8 80240498 00031080 */ sll $v0, $v1, 2 -/* CC12CC 8024049C 00431021 */ addu $v0, $v0, $v1 -/* CC12D0 802404A0 00021080 */ sll $v0, $v0, 2 -/* CC12D4 802404A4 00431023 */ subu $v0, $v0, $v1 -/* CC12D8 802404A8 000218C0 */ sll $v1, $v0, 3 -/* CC12DC 802404AC 00431021 */ addu $v0, $v0, $v1 -/* CC12E0 802404B0 000210C0 */ sll $v0, $v0, 3 -/* CC12E4 802404B4 46001032 */ c.eq.s $f2, $f0 -/* CC12E8 802404B8 3C01800B */ lui $at, 0x800b -/* CC12EC 802404BC 00220821 */ addu $at, $at, $v0 -/* CC12F0 802404C0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CC12F4 802404C4 45000005 */ bc1f .L802404DC -/* CC12F8 802404C8 00000000 */ nop -/* CC12FC 802404CC 3C0142C8 */ lui $at, 0x42c8 -/* CC1300 802404D0 44810000 */ mtc1 $at, $f0 -/* CC1304 802404D4 0809013B */ j .L802404EC -/* CC1308 802404D8 4600B581 */ sub.s $f22, $f22, $f0 -.L802404DC: -/* CC130C 802404DC 3C0142C8 */ lui $at, 0x42c8 -/* CC1310 802404E0 44810000 */ mtc1 $at, $f0 -/* CC1314 802404E4 00000000 */ nop -/* CC1318 802404E8 4600B580 */ add.s $f22, $f22, $f0 -.L802404EC: -/* CC131C 802404EC 0C00A6C9 */ jal clamp_angle -/* CC1320 802404F0 4600B306 */ mov.s $f12, $f22 -/* CC1324 802404F4 46000586 */ mov.s $f22, $f0 -/* CC1328 802404F8 3C014170 */ lui $at, 0x4170 -/* CC132C 802404FC 4481A000 */ mtc1 $at, $f20 -/* CC1330 80240500 0C00A8BB */ jal sin_deg -/* CC1334 80240504 4600B306 */ mov.s $f12, $f22 -/* CC1338 80240508 46140002 */ mul.s $f0, $f0, $f20 -/* CC133C 8024050C 00000000 */ nop -/* CC1340 80240510 864200B0 */ lh $v0, 0xb0($s2) -/* CC1344 80240514 3C013F00 */ lui $at, 0x3f00 -/* CC1348 80240518 44812000 */ mtc1 $at, $f4 -/* CC134C 8024051C 44821000 */ mtc1 $v0, $f2 -/* CC1350 80240520 00000000 */ nop -/* CC1354 80240524 468010A0 */ cvt.s.w $f2, $f2 -/* CC1358 80240528 46041082 */ mul.s $f2, $f2, $f4 -/* CC135C 8024052C 00000000 */ nop -/* CC1360 80240530 4600E700 */ add.s $f28, $f28, $f0 -/* CC1364 80240534 4602D680 */ add.s $f26, $f26, $f2 -/* CC1368 80240538 0C00A8D4 */ jal cos_deg -/* CC136C 8024053C 4600B306 */ mov.s $f12, $f22 -/* CC1370 80240540 46140002 */ mul.s $f0, $f0, $f20 -/* CC1374 80240544 00000000 */ nop -/* CC1378 80240548 0220202D */ daddu $a0, $s1, $zero -/* CC137C 8024054C 0260282D */ daddu $a1, $s3, $zero -/* CC1380 80240550 4600E18D */ trunc.w.s $f6, $f28 -/* CC1384 80240554 44063000 */ mfc1 $a2, $f6 -/* CC1388 80240558 0C0B2026 */ jal set_variable -/* CC138C 8024055C 4600C601 */ sub.s $f24, $f24, $f0 -/* CC1390 80240560 0220202D */ daddu $a0, $s1, $zero -/* CC1394 80240564 4600D18D */ trunc.w.s $f6, $f26 -/* CC1398 80240568 44063000 */ mfc1 $a2, $f6 -/* CC139C 8024056C 0C0B2026 */ jal set_variable -/* CC13A0 80240570 0280282D */ daddu $a1, $s4, $zero -/* CC13A4 80240574 0220202D */ daddu $a0, $s1, $zero -/* CC13A8 80240578 4600C18D */ trunc.w.s $f6, $f24 -/* CC13AC 8024057C 44063000 */ mfc1 $a2, $f6 -/* CC13B0 80240580 0C0B2026 */ jal set_variable -/* CC13B4 80240584 0200282D */ daddu $a1, $s0, $zero -/* CC13B8 80240588 8FBF0024 */ lw $ra, 0x24($sp) -/* CC13BC 8024058C 8FB40020 */ lw $s4, 0x20($sp) -/* CC13C0 80240590 8FB3001C */ lw $s3, 0x1c($sp) -/* CC13C4 80240594 8FB20018 */ lw $s2, 0x18($sp) -/* CC13C8 80240598 8FB10014 */ lw $s1, 0x14($sp) -/* CC13CC 8024059C 8FB00010 */ lw $s0, 0x10($sp) -/* CC13D0 802405A0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CC13D4 802405A4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CC13D8 802405A8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CC13DC 802405AC D7B60030 */ ldc1 $f22, 0x30($sp) -/* CC13E0 802405B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CC13E4 802405B4 24020002 */ addiu $v0, $zero, 2 -/* CC13E8 802405B8 03E00008 */ jr $ra -/* CC13EC 802405BC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242064.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242064.s deleted file mode 100644 index a2d6dcd689..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242064.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242064 -/* CCD374 80242064 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CCD378 80242068 AFB10014 */ sw $s1, 0x14($sp) -/* CCD37C 8024206C 0080882D */ daddu $s1, $a0, $zero -/* CCD380 80242070 AFBF0024 */ sw $ra, 0x24($sp) -/* CCD384 80242074 AFB40020 */ sw $s4, 0x20($sp) -/* CCD388 80242078 AFB3001C */ sw $s3, 0x1c($sp) -/* CCD38C 8024207C AFB20018 */ sw $s2, 0x18($sp) -/* CCD390 80242080 AFB00010 */ sw $s0, 0x10($sp) -/* CCD394 80242084 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CCD398 80242088 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CCD39C 8024208C F7B80038 */ sdc1 $f24, 0x38($sp) -/* CCD3A0 80242090 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CCD3A4 80242094 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CCD3A8 80242098 8E30000C */ lw $s0, 0xc($s1) -/* CCD3AC 8024209C 8E130000 */ lw $s3, ($s0) -/* CCD3B0 802420A0 26100004 */ addiu $s0, $s0, 4 -/* CCD3B4 802420A4 0C0B1EAF */ jal get_variable -/* CCD3B8 802420A8 0260282D */ daddu $a1, $s3, $zero -/* CCD3BC 802420AC 4482E000 */ mtc1 $v0, $f28 -/* CCD3C0 802420B0 00000000 */ nop -/* CCD3C4 802420B4 4680E720 */ cvt.s.w $f28, $f28 -/* CCD3C8 802420B8 8E140000 */ lw $s4, ($s0) -/* CCD3CC 802420BC 26100004 */ addiu $s0, $s0, 4 -/* CCD3D0 802420C0 0220202D */ daddu $a0, $s1, $zero -/* CCD3D4 802420C4 0C0B1EAF */ jal get_variable -/* CCD3D8 802420C8 0280282D */ daddu $a1, $s4, $zero -/* CCD3DC 802420CC 4482D000 */ mtc1 $v0, $f26 -/* CCD3E0 802420D0 00000000 */ nop -/* CCD3E4 802420D4 4680D6A0 */ cvt.s.w $f26, $f26 -/* CCD3E8 802420D8 8E100000 */ lw $s0, ($s0) -/* CCD3EC 802420DC 0220202D */ daddu $a0, $s1, $zero -/* CCD3F0 802420E0 0C0B1EAF */ jal get_variable -/* CCD3F4 802420E4 0200282D */ daddu $a1, $s0, $zero -/* CCD3F8 802420E8 4482C000 */ mtc1 $v0, $f24 -/* CCD3FC 802420EC 00000000 */ nop -/* CCD400 802420F0 4680C620 */ cvt.s.w $f24, $f24 -/* CCD404 802420F4 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CCD408 802420F8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CCD40C 802420FC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CCD410 80242100 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CCD414 80242104 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CCD418 80242108 44800000 */ mtc1 $zero, $f0 -/* CCD41C 8024210C 00031080 */ sll $v0, $v1, 2 -/* CCD420 80242110 00431021 */ addu $v0, $v0, $v1 -/* CCD424 80242114 00021080 */ sll $v0, $v0, 2 -/* CCD428 80242118 00431023 */ subu $v0, $v0, $v1 -/* CCD42C 8024211C 000218C0 */ sll $v1, $v0, 3 -/* CCD430 80242120 00431021 */ addu $v0, $v0, $v1 -/* CCD434 80242124 000210C0 */ sll $v0, $v0, 3 -/* CCD438 80242128 46001032 */ c.eq.s $f2, $f0 -/* CCD43C 8024212C 3C01800B */ lui $at, 0x800b -/* CCD440 80242130 00220821 */ addu $at, $at, $v0 -/* CCD444 80242134 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CCD448 80242138 45000005 */ bc1f .L80242150 -/* CCD44C 8024213C 00000000 */ nop -/* CCD450 80242140 3C0142C8 */ lui $at, 0x42c8 -/* CCD454 80242144 44810000 */ mtc1 $at, $f0 -/* CCD458 80242148 08090858 */ j .L80242160 -/* CCD45C 8024214C 4600B581 */ sub.s $f22, $f22, $f0 -.L80242150: -/* CCD460 80242150 3C0142C8 */ lui $at, 0x42c8 -/* CCD464 80242154 44810000 */ mtc1 $at, $f0 -/* CCD468 80242158 00000000 */ nop -/* CCD46C 8024215C 4600B580 */ add.s $f22, $f22, $f0 -.L80242160: -/* CCD470 80242160 0C00A6C9 */ jal clamp_angle -/* CCD474 80242164 4600B306 */ mov.s $f12, $f22 -/* CCD478 80242168 46000586 */ mov.s $f22, $f0 -/* CCD47C 8024216C 3C014170 */ lui $at, 0x4170 -/* CCD480 80242170 4481A000 */ mtc1 $at, $f20 -/* CCD484 80242174 0C00A8BB */ jal sin_deg -/* CCD488 80242178 4600B306 */ mov.s $f12, $f22 -/* CCD48C 8024217C 46140002 */ mul.s $f0, $f0, $f20 -/* CCD490 80242180 00000000 */ nop -/* CCD494 80242184 864200B0 */ lh $v0, 0xb0($s2) -/* CCD498 80242188 3C013F00 */ lui $at, 0x3f00 -/* CCD49C 8024218C 44812000 */ mtc1 $at, $f4 -/* CCD4A0 80242190 44821000 */ mtc1 $v0, $f2 -/* CCD4A4 80242194 00000000 */ nop -/* CCD4A8 80242198 468010A0 */ cvt.s.w $f2, $f2 -/* CCD4AC 8024219C 46041082 */ mul.s $f2, $f2, $f4 -/* CCD4B0 802421A0 00000000 */ nop -/* CCD4B4 802421A4 4600E700 */ add.s $f28, $f28, $f0 -/* CCD4B8 802421A8 4602D680 */ add.s $f26, $f26, $f2 -/* CCD4BC 802421AC 0C00A8D4 */ jal cos_deg -/* CCD4C0 802421B0 4600B306 */ mov.s $f12, $f22 -/* CCD4C4 802421B4 46140002 */ mul.s $f0, $f0, $f20 -/* CCD4C8 802421B8 00000000 */ nop -/* CCD4CC 802421BC 0220202D */ daddu $a0, $s1, $zero -/* CCD4D0 802421C0 0260282D */ daddu $a1, $s3, $zero -/* CCD4D4 802421C4 4600E18D */ trunc.w.s $f6, $f28 -/* CCD4D8 802421C8 44063000 */ mfc1 $a2, $f6 -/* CCD4DC 802421CC 0C0B2026 */ jal set_variable -/* CCD4E0 802421D0 4600C601 */ sub.s $f24, $f24, $f0 -/* CCD4E4 802421D4 0220202D */ daddu $a0, $s1, $zero -/* CCD4E8 802421D8 4600D18D */ trunc.w.s $f6, $f26 -/* CCD4EC 802421DC 44063000 */ mfc1 $a2, $f6 -/* CCD4F0 802421E0 0C0B2026 */ jal set_variable -/* CCD4F4 802421E4 0280282D */ daddu $a1, $s4, $zero -/* CCD4F8 802421E8 0220202D */ daddu $a0, $s1, $zero -/* CCD4FC 802421EC 4600C18D */ trunc.w.s $f6, $f24 -/* CCD500 802421F0 44063000 */ mfc1 $a2, $f6 -/* CCD504 802421F4 0C0B2026 */ jal set_variable -/* CCD508 802421F8 0200282D */ daddu $a1, $s0, $zero -/* CCD50C 802421FC 8FBF0024 */ lw $ra, 0x24($sp) -/* CCD510 80242200 8FB40020 */ lw $s4, 0x20($sp) -/* CCD514 80242204 8FB3001C */ lw $s3, 0x1c($sp) -/* CCD518 80242208 8FB20018 */ lw $s2, 0x18($sp) -/* CCD51C 8024220C 8FB10014 */ lw $s1, 0x14($sp) -/* CCD520 80242210 8FB00010 */ lw $s0, 0x10($sp) -/* CCD524 80242214 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CCD528 80242218 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CCD52C 8024221C D7B80038 */ ldc1 $f24, 0x38($sp) -/* CCD530 80242220 D7B60030 */ ldc1 $f22, 0x30($sp) -/* CCD534 80242224 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CCD538 80242228 24020002 */ addiu $v0, $zero, 2 -/* CCD53C 8024222C 03E00008 */ jr $ra -/* CCD540 80242230 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s index 6573be8d48..49186a69c3 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s @@ -27,7 +27,7 @@ glabel func_80240200_CD2030 /* CD2084 80240254 50400008 */ beql $v0, $zero, .L80240278 /* CD2088 80240258 26100001 */ addiu $s0, $s0, 1 /* CD208C 8024025C 0200202D */ daddu $a0, $s0, $zero -/* CD2090 80240260 0C09006D */ jal func_802401B4 +/* CD2090 80240260 0C09006D */ jal func_802401B4_CD1FE4 /* CD2094 80240264 00122C03 */ sra $a1, $s2, 0x10 /* CD2098 80240268 10540003 */ beq $v0, $s4, .L80240278 /* CD209C 8024026C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s index a09d050134..f0f8d2470c 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s @@ -49,7 +49,7 @@ glabel func_802402AC_CD20DC /* CD2188 80240358 AE300108 */ sw $s0, 0x108($s1) /* CD218C 8024035C 8C420000 */ lw $v0, ($v0) /* CD2190 80240360 02E0282D */ daddu $a1, $s7, $zero -/* CD2194 80240364 0C09006D */ jal func_802401B4 +/* CD2194 80240364 0C09006D */ jal func_802401B4_CD1FE4 /* CD2198 80240368 AE220084 */ sw $v0, 0x84($s1) /* CD219C 8024036C 0040202D */ daddu $a0, $v0, $zero /* CD21A0 80240370 04800011 */ bltz $a0, .L802403B8 diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024009C_CEE2FC.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024009C_CEE2FC.s deleted file mode 100644 index 57f1ed0a84..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024009C_CEE2FC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024009C_CEE2FC -/* CEE2FC 8024009C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CEE300 802400A0 AFB10014 */ sw $s1, 0x14($sp) -/* CEE304 802400A4 0080882D */ daddu $s1, $a0, $zero -/* CEE308 802400A8 AFBF0024 */ sw $ra, 0x24($sp) -/* CEE30C 802400AC AFB40020 */ sw $s4, 0x20($sp) -/* CEE310 802400B0 AFB3001C */ sw $s3, 0x1c($sp) -/* CEE314 802400B4 AFB20018 */ sw $s2, 0x18($sp) -/* CEE318 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* CEE31C 802400BC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CEE320 802400C0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CEE324 802400C4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CEE328 802400C8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CEE32C 802400CC F7B40028 */ sdc1 $f20, 0x28($sp) -/* CEE330 802400D0 8E30000C */ lw $s0, 0xc($s1) -/* CEE334 802400D4 8E130000 */ lw $s3, ($s0) -/* CEE338 802400D8 26100004 */ addiu $s0, $s0, 4 -/* CEE33C 802400DC 0C0B1EAF */ jal get_variable -/* CEE340 802400E0 0260282D */ daddu $a1, $s3, $zero -/* CEE344 802400E4 4482E000 */ mtc1 $v0, $f28 -/* CEE348 802400E8 00000000 */ nop -/* CEE34C 802400EC 4680E720 */ cvt.s.w $f28, $f28 -/* CEE350 802400F0 8E140000 */ lw $s4, ($s0) -/* CEE354 802400F4 26100004 */ addiu $s0, $s0, 4 -/* CEE358 802400F8 0220202D */ daddu $a0, $s1, $zero -/* CEE35C 802400FC 0C0B1EAF */ jal get_variable -/* CEE360 80240100 0280282D */ daddu $a1, $s4, $zero -/* CEE364 80240104 4482D000 */ mtc1 $v0, $f26 -/* CEE368 80240108 00000000 */ nop -/* CEE36C 8024010C 4680D6A0 */ cvt.s.w $f26, $f26 -/* CEE370 80240110 8E100000 */ lw $s0, ($s0) -/* CEE374 80240114 0220202D */ daddu $a0, $s1, $zero -/* CEE378 80240118 0C0B1EAF */ jal get_variable -/* CEE37C 8024011C 0200282D */ daddu $a1, $s0, $zero -/* CEE380 80240120 4482C000 */ mtc1 $v0, $f24 -/* CEE384 80240124 00000000 */ nop -/* CEE388 80240128 4680C620 */ cvt.s.w $f24, $f24 -/* CEE38C 8024012C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CEE390 80240130 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CEE394 80240134 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CEE398 80240138 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CEE39C 8024013C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CEE3A0 80240140 44800000 */ mtc1 $zero, $f0 -/* CEE3A4 80240144 00031080 */ sll $v0, $v1, 2 -/* CEE3A8 80240148 00431021 */ addu $v0, $v0, $v1 -/* CEE3AC 8024014C 00021080 */ sll $v0, $v0, 2 -/* CEE3B0 80240150 00431023 */ subu $v0, $v0, $v1 -/* CEE3B4 80240154 000218C0 */ sll $v1, $v0, 3 -/* CEE3B8 80240158 00431021 */ addu $v0, $v0, $v1 -/* CEE3BC 8024015C 000210C0 */ sll $v0, $v0, 3 -/* CEE3C0 80240160 46001032 */ c.eq.s $f2, $f0 -/* CEE3C4 80240164 3C01800B */ lui $at, 0x800b -/* CEE3C8 80240168 00220821 */ addu $at, $at, $v0 -/* CEE3CC 8024016C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CEE3D0 80240170 45000005 */ bc1f .L80240188 -/* CEE3D4 80240174 00000000 */ nop -/* CEE3D8 80240178 3C0142C8 */ lui $at, 0x42c8 -/* CEE3DC 8024017C 44810000 */ mtc1 $at, $f0 -/* CEE3E0 80240180 08090066 */ j .L80240198 -/* CEE3E4 80240184 4600B581 */ sub.s $f22, $f22, $f0 -.L80240188: -/* CEE3E8 80240188 3C0142C8 */ lui $at, 0x42c8 -/* CEE3EC 8024018C 44810000 */ mtc1 $at, $f0 -/* CEE3F0 80240190 00000000 */ nop -/* CEE3F4 80240194 4600B580 */ add.s $f22, $f22, $f0 -.L80240198: -/* CEE3F8 80240198 0C00A6C9 */ jal clamp_angle -/* CEE3FC 8024019C 4600B306 */ mov.s $f12, $f22 -/* CEE400 802401A0 46000586 */ mov.s $f22, $f0 -/* CEE404 802401A4 3C014170 */ lui $at, 0x4170 -/* CEE408 802401A8 4481A000 */ mtc1 $at, $f20 -/* CEE40C 802401AC 0C00A8BB */ jal sin_deg -/* CEE410 802401B0 4600B306 */ mov.s $f12, $f22 -/* CEE414 802401B4 46140002 */ mul.s $f0, $f0, $f20 -/* CEE418 802401B8 00000000 */ nop -/* CEE41C 802401BC 864200B0 */ lh $v0, 0xb0($s2) -/* CEE420 802401C0 3C013F00 */ lui $at, 0x3f00 -/* CEE424 802401C4 44812000 */ mtc1 $at, $f4 -/* CEE428 802401C8 44821000 */ mtc1 $v0, $f2 -/* CEE42C 802401CC 00000000 */ nop -/* CEE430 802401D0 468010A0 */ cvt.s.w $f2, $f2 -/* CEE434 802401D4 46041082 */ mul.s $f2, $f2, $f4 -/* CEE438 802401D8 00000000 */ nop -/* CEE43C 802401DC 4600E700 */ add.s $f28, $f28, $f0 -/* CEE440 802401E0 4602D680 */ add.s $f26, $f26, $f2 -/* CEE444 802401E4 0C00A8D4 */ jal cos_deg -/* CEE448 802401E8 4600B306 */ mov.s $f12, $f22 -/* CEE44C 802401EC 46140002 */ mul.s $f0, $f0, $f20 -/* CEE450 802401F0 00000000 */ nop -/* CEE454 802401F4 0220202D */ daddu $a0, $s1, $zero -/* CEE458 802401F8 0260282D */ daddu $a1, $s3, $zero -/* CEE45C 802401FC 4600E18D */ trunc.w.s $f6, $f28 -/* CEE460 80240200 44063000 */ mfc1 $a2, $f6 -/* CEE464 80240204 0C0B2026 */ jal set_variable -/* CEE468 80240208 4600C601 */ sub.s $f24, $f24, $f0 -/* CEE46C 8024020C 0220202D */ daddu $a0, $s1, $zero -/* CEE470 80240210 4600D18D */ trunc.w.s $f6, $f26 -/* CEE474 80240214 44063000 */ mfc1 $a2, $f6 -/* CEE478 80240218 0C0B2026 */ jal set_variable -/* CEE47C 8024021C 0280282D */ daddu $a1, $s4, $zero -/* CEE480 80240220 0220202D */ daddu $a0, $s1, $zero -/* CEE484 80240224 4600C18D */ trunc.w.s $f6, $f24 -/* CEE488 80240228 44063000 */ mfc1 $a2, $f6 -/* CEE48C 8024022C 0C0B2026 */ jal set_variable -/* CEE490 80240230 0200282D */ daddu $a1, $s0, $zero -/* CEE494 80240234 8FBF0024 */ lw $ra, 0x24($sp) -/* CEE498 80240238 8FB40020 */ lw $s4, 0x20($sp) -/* CEE49C 8024023C 8FB3001C */ lw $s3, 0x1c($sp) -/* CEE4A0 80240240 8FB20018 */ lw $s2, 0x18($sp) -/* CEE4A4 80240244 8FB10014 */ lw $s1, 0x14($sp) -/* CEE4A8 80240248 8FB00010 */ lw $s0, 0x10($sp) -/* CEE4AC 8024024C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CEE4B0 80240250 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CEE4B4 80240254 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CEE4B8 80240258 D7B60030 */ ldc1 $f22, 0x30($sp) -/* CEE4BC 8024025C D7B40028 */ ldc1 $f20, 0x28($sp) -/* CEE4C0 80240260 24020002 */ addiu $v0, $zero, 2 -/* CEE4C4 80240264 03E00008 */ jr $ra -/* CEE4C8 80240268 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241B88.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241B88.s deleted file mode 100644 index 355b6ed02a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241B88.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B88 -/* CF4758 80241B88 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF475C 80241B8C AFB10014 */ sw $s1, 0x14($sp) -/* CF4760 80241B90 0080882D */ daddu $s1, $a0, $zero -/* CF4764 80241B94 AFBF0024 */ sw $ra, 0x24($sp) -/* CF4768 80241B98 AFB40020 */ sw $s4, 0x20($sp) -/* CF476C 80241B9C AFB3001C */ sw $s3, 0x1c($sp) -/* CF4770 80241BA0 AFB20018 */ sw $s2, 0x18($sp) -/* CF4774 80241BA4 AFB00010 */ sw $s0, 0x10($sp) -/* CF4778 80241BA8 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CF477C 80241BAC F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CF4780 80241BB0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CF4784 80241BB4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CF4788 80241BB8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CF478C 80241BBC 8E30000C */ lw $s0, 0xc($s1) -/* CF4790 80241BC0 8E130000 */ lw $s3, ($s0) -/* CF4794 80241BC4 26100004 */ addiu $s0, $s0, 4 -/* CF4798 80241BC8 0C0B1EAF */ jal get_variable -/* CF479C 80241BCC 0260282D */ daddu $a1, $s3, $zero -/* CF47A0 80241BD0 4482E000 */ mtc1 $v0, $f28 -/* CF47A4 80241BD4 00000000 */ nop -/* CF47A8 80241BD8 4680E720 */ cvt.s.w $f28, $f28 -/* CF47AC 80241BDC 8E140000 */ lw $s4, ($s0) -/* CF47B0 80241BE0 26100004 */ addiu $s0, $s0, 4 -/* CF47B4 80241BE4 0220202D */ daddu $a0, $s1, $zero -/* CF47B8 80241BE8 0C0B1EAF */ jal get_variable -/* CF47BC 80241BEC 0280282D */ daddu $a1, $s4, $zero -/* CF47C0 80241BF0 4482D000 */ mtc1 $v0, $f26 -/* CF47C4 80241BF4 00000000 */ nop -/* CF47C8 80241BF8 4680D6A0 */ cvt.s.w $f26, $f26 -/* CF47CC 80241BFC 8E100000 */ lw $s0, ($s0) -/* CF47D0 80241C00 0220202D */ daddu $a0, $s1, $zero -/* CF47D4 80241C04 0C0B1EAF */ jal get_variable -/* CF47D8 80241C08 0200282D */ daddu $a1, $s0, $zero -/* CF47DC 80241C0C 4482C000 */ mtc1 $v0, $f24 -/* CF47E0 80241C10 00000000 */ nop -/* CF47E4 80241C14 4680C620 */ cvt.s.w $f24, $f24 -/* CF47E8 80241C18 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CF47EC 80241C1C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CF47F0 80241C20 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CF47F4 80241C24 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CF47F8 80241C28 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CF47FC 80241C2C 44800000 */ mtc1 $zero, $f0 -/* CF4800 80241C30 00031080 */ sll $v0, $v1, 2 -/* CF4804 80241C34 00431021 */ addu $v0, $v0, $v1 -/* CF4808 80241C38 00021080 */ sll $v0, $v0, 2 -/* CF480C 80241C3C 00431023 */ subu $v0, $v0, $v1 -/* CF4810 80241C40 000218C0 */ sll $v1, $v0, 3 -/* CF4814 80241C44 00431021 */ addu $v0, $v0, $v1 -/* CF4818 80241C48 000210C0 */ sll $v0, $v0, 3 -/* CF481C 80241C4C 46001032 */ c.eq.s $f2, $f0 -/* CF4820 80241C50 3C01800B */ lui $at, 0x800b -/* CF4824 80241C54 00220821 */ addu $at, $at, $v0 -/* CF4828 80241C58 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CF482C 80241C5C 45000005 */ bc1f .L80241C74 -/* CF4830 80241C60 00000000 */ nop -/* CF4834 80241C64 3C0142C8 */ lui $at, 0x42c8 -/* CF4838 80241C68 44810000 */ mtc1 $at, $f0 -/* CF483C 80241C6C 08090721 */ j .L80241C84 -/* CF4840 80241C70 4600B581 */ sub.s $f22, $f22, $f0 -.L80241C74: -/* CF4844 80241C74 3C0142C8 */ lui $at, 0x42c8 -/* CF4848 80241C78 44810000 */ mtc1 $at, $f0 -/* CF484C 80241C7C 00000000 */ nop -/* CF4850 80241C80 4600B580 */ add.s $f22, $f22, $f0 -.L80241C84: -/* CF4854 80241C84 0C00A6C9 */ jal clamp_angle -/* CF4858 80241C88 4600B306 */ mov.s $f12, $f22 -/* CF485C 80241C8C 46000586 */ mov.s $f22, $f0 -/* CF4860 80241C90 3C014170 */ lui $at, 0x4170 -/* CF4864 80241C94 4481A000 */ mtc1 $at, $f20 -/* CF4868 80241C98 0C00A8BB */ jal sin_deg -/* CF486C 80241C9C 4600B306 */ mov.s $f12, $f22 -/* CF4870 80241CA0 46140002 */ mul.s $f0, $f0, $f20 -/* CF4874 80241CA4 00000000 */ nop -/* CF4878 80241CA8 864200B0 */ lh $v0, 0xb0($s2) -/* CF487C 80241CAC 3C013F00 */ lui $at, 0x3f00 -/* CF4880 80241CB0 44812000 */ mtc1 $at, $f4 -/* CF4884 80241CB4 44821000 */ mtc1 $v0, $f2 -/* CF4888 80241CB8 00000000 */ nop -/* CF488C 80241CBC 468010A0 */ cvt.s.w $f2, $f2 -/* CF4890 80241CC0 46041082 */ mul.s $f2, $f2, $f4 -/* CF4894 80241CC4 00000000 */ nop -/* CF4898 80241CC8 4600E700 */ add.s $f28, $f28, $f0 -/* CF489C 80241CCC 4602D680 */ add.s $f26, $f26, $f2 -/* CF48A0 80241CD0 0C00A8D4 */ jal cos_deg -/* CF48A4 80241CD4 4600B306 */ mov.s $f12, $f22 -/* CF48A8 80241CD8 46140002 */ mul.s $f0, $f0, $f20 -/* CF48AC 80241CDC 00000000 */ nop -/* CF48B0 80241CE0 0220202D */ daddu $a0, $s1, $zero -/* CF48B4 80241CE4 0260282D */ daddu $a1, $s3, $zero -/* CF48B8 80241CE8 4600E18D */ trunc.w.s $f6, $f28 -/* CF48BC 80241CEC 44063000 */ mfc1 $a2, $f6 -/* CF48C0 80241CF0 0C0B2026 */ jal set_variable -/* CF48C4 80241CF4 4600C601 */ sub.s $f24, $f24, $f0 -/* CF48C8 80241CF8 0220202D */ daddu $a0, $s1, $zero -/* CF48CC 80241CFC 4600D18D */ trunc.w.s $f6, $f26 -/* CF48D0 80241D00 44063000 */ mfc1 $a2, $f6 -/* CF48D4 80241D04 0C0B2026 */ jal set_variable -/* CF48D8 80241D08 0280282D */ daddu $a1, $s4, $zero -/* CF48DC 80241D0C 0220202D */ daddu $a0, $s1, $zero -/* CF48E0 80241D10 4600C18D */ trunc.w.s $f6, $f24 -/* CF48E4 80241D14 44063000 */ mfc1 $a2, $f6 -/* CF48E8 80241D18 0C0B2026 */ jal set_variable -/* CF48EC 80241D1C 0200282D */ daddu $a1, $s0, $zero -/* CF48F0 80241D20 8FBF0024 */ lw $ra, 0x24($sp) -/* CF48F4 80241D24 8FB40020 */ lw $s4, 0x20($sp) -/* CF48F8 80241D28 8FB3001C */ lw $s3, 0x1c($sp) -/* CF48FC 80241D2C 8FB20018 */ lw $s2, 0x18($sp) -/* CF4900 80241D30 8FB10014 */ lw $s1, 0x14($sp) -/* CF4904 80241D34 8FB00010 */ lw $s0, 0x10($sp) -/* CF4908 80241D38 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CF490C 80241D3C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CF4910 80241D40 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CF4914 80241D44 D7B60030 */ ldc1 $f22, 0x30($sp) -/* CF4918 80241D48 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CF491C 80241D4C 24020002 */ addiu $v0, $zero, 2 -/* CF4920 80241D50 03E00008 */ jr $ra -/* CF4924 80241D54 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240484.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240484.s deleted file mode 100644 index 8d4e17ea9a..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240484.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240484 -/* A39964 80240484 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A39968 80240488 AFB10014 */ sw $s1, 0x14($sp) -/* A3996C 8024048C 0080882D */ daddu $s1, $a0, $zero -/* A39970 80240490 AFBF0024 */ sw $ra, 0x24($sp) -/* A39974 80240494 AFB40020 */ sw $s4, 0x20($sp) -/* A39978 80240498 AFB3001C */ sw $s3, 0x1c($sp) -/* A3997C 8024049C AFB20018 */ sw $s2, 0x18($sp) -/* A39980 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* A39984 802404A4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* A39988 802404A8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* A3998C 802404AC F7B80038 */ sdc1 $f24, 0x38($sp) -/* A39990 802404B0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A39994 802404B4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A39998 802404B8 8E30000C */ lw $s0, 0xc($s1) -/* A3999C 802404BC 8E130000 */ lw $s3, ($s0) -/* A399A0 802404C0 26100004 */ addiu $s0, $s0, 4 -/* A399A4 802404C4 0C0B1EAF */ jal get_variable -/* A399A8 802404C8 0260282D */ daddu $a1, $s3, $zero -/* A399AC 802404CC 4482E000 */ mtc1 $v0, $f28 -/* A399B0 802404D0 00000000 */ nop -/* A399B4 802404D4 4680E720 */ cvt.s.w $f28, $f28 -/* A399B8 802404D8 8E140000 */ lw $s4, ($s0) -/* A399BC 802404DC 26100004 */ addiu $s0, $s0, 4 -/* A399C0 802404E0 0220202D */ daddu $a0, $s1, $zero -/* A399C4 802404E4 0C0B1EAF */ jal get_variable -/* A399C8 802404E8 0280282D */ daddu $a1, $s4, $zero -/* A399CC 802404EC 4482D000 */ mtc1 $v0, $f26 -/* A399D0 802404F0 00000000 */ nop -/* A399D4 802404F4 4680D6A0 */ cvt.s.w $f26, $f26 -/* A399D8 802404F8 8E100000 */ lw $s0, ($s0) -/* A399DC 802404FC 0220202D */ daddu $a0, $s1, $zero -/* A399E0 80240500 0C0B1EAF */ jal get_variable -/* A399E4 80240504 0200282D */ daddu $a1, $s0, $zero -/* A399E8 80240508 4482C000 */ mtc1 $v0, $f24 -/* A399EC 8024050C 00000000 */ nop -/* A399F0 80240510 4680C620 */ cvt.s.w $f24, $f24 -/* A399F4 80240514 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* A399F8 80240518 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* A399FC 8024051C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A39A00 80240520 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A39A04 80240524 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* A39A08 80240528 44800000 */ mtc1 $zero, $f0 -/* A39A0C 8024052C 00031080 */ sll $v0, $v1, 2 -/* A39A10 80240530 00431021 */ addu $v0, $v0, $v1 -/* A39A14 80240534 00021080 */ sll $v0, $v0, 2 -/* A39A18 80240538 00431023 */ subu $v0, $v0, $v1 -/* A39A1C 8024053C 000218C0 */ sll $v1, $v0, 3 -/* A39A20 80240540 00431021 */ addu $v0, $v0, $v1 -/* A39A24 80240544 000210C0 */ sll $v0, $v0, 3 -/* A39A28 80240548 46001032 */ c.eq.s $f2, $f0 -/* A39A2C 8024054C 3C01800B */ lui $at, 0x800b -/* A39A30 80240550 00220821 */ addu $at, $at, $v0 -/* A39A34 80240554 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* A39A38 80240558 45000005 */ bc1f .L80240570 -/* A39A3C 8024055C 00000000 */ nop -/* A39A40 80240560 3C0142C8 */ lui $at, 0x42c8 -/* A39A44 80240564 44810000 */ mtc1 $at, $f0 -/* A39A48 80240568 08090160 */ j .L80240580 -/* A39A4C 8024056C 4600B581 */ sub.s $f22, $f22, $f0 -.L80240570: -/* A39A50 80240570 3C0142C8 */ lui $at, 0x42c8 -/* A39A54 80240574 44810000 */ mtc1 $at, $f0 -/* A39A58 80240578 00000000 */ nop -/* A39A5C 8024057C 4600B580 */ add.s $f22, $f22, $f0 -.L80240580: -/* A39A60 80240580 0C00A6C9 */ jal clamp_angle -/* A39A64 80240584 4600B306 */ mov.s $f12, $f22 -/* A39A68 80240588 46000586 */ mov.s $f22, $f0 -/* A39A6C 8024058C 3C014170 */ lui $at, 0x4170 -/* A39A70 80240590 4481A000 */ mtc1 $at, $f20 -/* A39A74 80240594 0C00A8BB */ jal sin_deg -/* A39A78 80240598 4600B306 */ mov.s $f12, $f22 -/* A39A7C 8024059C 46140002 */ mul.s $f0, $f0, $f20 -/* A39A80 802405A0 00000000 */ nop -/* A39A84 802405A4 864200B0 */ lh $v0, 0xb0($s2) -/* A39A88 802405A8 3C013F00 */ lui $at, 0x3f00 -/* A39A8C 802405AC 44812000 */ mtc1 $at, $f4 -/* A39A90 802405B0 44821000 */ mtc1 $v0, $f2 -/* A39A94 802405B4 00000000 */ nop -/* A39A98 802405B8 468010A0 */ cvt.s.w $f2, $f2 -/* A39A9C 802405BC 46041082 */ mul.s $f2, $f2, $f4 -/* A39AA0 802405C0 00000000 */ nop -/* A39AA4 802405C4 4600E700 */ add.s $f28, $f28, $f0 -/* A39AA8 802405C8 4602D680 */ add.s $f26, $f26, $f2 -/* A39AAC 802405CC 0C00A8D4 */ jal cos_deg -/* A39AB0 802405D0 4600B306 */ mov.s $f12, $f22 -/* A39AB4 802405D4 46140002 */ mul.s $f0, $f0, $f20 -/* A39AB8 802405D8 00000000 */ nop -/* A39ABC 802405DC 0220202D */ daddu $a0, $s1, $zero -/* A39AC0 802405E0 0260282D */ daddu $a1, $s3, $zero -/* A39AC4 802405E4 4600E18D */ trunc.w.s $f6, $f28 -/* A39AC8 802405E8 44063000 */ mfc1 $a2, $f6 -/* A39ACC 802405EC 0C0B2026 */ jal set_variable -/* A39AD0 802405F0 4600C601 */ sub.s $f24, $f24, $f0 -/* A39AD4 802405F4 0220202D */ daddu $a0, $s1, $zero -/* A39AD8 802405F8 4600D18D */ trunc.w.s $f6, $f26 -/* A39ADC 802405FC 44063000 */ mfc1 $a2, $f6 -/* A39AE0 80240600 0C0B2026 */ jal set_variable -/* A39AE4 80240604 0280282D */ daddu $a1, $s4, $zero -/* A39AE8 80240608 0220202D */ daddu $a0, $s1, $zero -/* A39AEC 8024060C 4600C18D */ trunc.w.s $f6, $f24 -/* A39AF0 80240610 44063000 */ mfc1 $a2, $f6 -/* A39AF4 80240614 0C0B2026 */ jal set_variable -/* A39AF8 80240618 0200282D */ daddu $a1, $s0, $zero -/* A39AFC 8024061C 8FBF0024 */ lw $ra, 0x24($sp) -/* A39B00 80240620 8FB40020 */ lw $s4, 0x20($sp) -/* A39B04 80240624 8FB3001C */ lw $s3, 0x1c($sp) -/* A39B08 80240628 8FB20018 */ lw $s2, 0x18($sp) -/* A39B0C 8024062C 8FB10014 */ lw $s1, 0x14($sp) -/* A39B10 80240630 8FB00010 */ lw $s0, 0x10($sp) -/* A39B14 80240634 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* A39B18 80240638 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* A39B1C 8024063C D7B80038 */ ldc1 $f24, 0x38($sp) -/* A39B20 80240640 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A39B24 80240644 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A39B28 80240648 24020002 */ addiu $v0, $zero, 2 -/* A39B2C 8024064C 03E00008 */ jr $ra -/* A39B30 80240650 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240DAC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240DAC.s deleted file mode 100644 index 266ebfdea8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240DAC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DAC -/* A3A28C 80240DAC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A3A290 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* A3A294 80240DB4 0080882D */ daddu $s1, $a0, $zero -/* A3A298 80240DB8 AFBF0024 */ sw $ra, 0x24($sp) -/* A3A29C 80240DBC AFB40020 */ sw $s4, 0x20($sp) -/* A3A2A0 80240DC0 AFB3001C */ sw $s3, 0x1c($sp) -/* A3A2A4 80240DC4 AFB20018 */ sw $s2, 0x18($sp) -/* A3A2A8 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* A3A2AC 80240DCC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* A3A2B0 80240DD0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* A3A2B4 80240DD4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* A3A2B8 80240DD8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A3A2BC 80240DDC F7B40028 */ sdc1 $f20, 0x28($sp) -/* A3A2C0 80240DE0 8E30000C */ lw $s0, 0xc($s1) -/* A3A2C4 80240DE4 8E130000 */ lw $s3, ($s0) -/* A3A2C8 80240DE8 26100004 */ addiu $s0, $s0, 4 -/* A3A2CC 80240DEC 0C0B1EAF */ jal get_variable -/* A3A2D0 80240DF0 0260282D */ daddu $a1, $s3, $zero -/* A3A2D4 80240DF4 4482E000 */ mtc1 $v0, $f28 -/* A3A2D8 80240DF8 00000000 */ nop -/* A3A2DC 80240DFC 4680E720 */ cvt.s.w $f28, $f28 -/* A3A2E0 80240E00 8E140000 */ lw $s4, ($s0) -/* A3A2E4 80240E04 26100004 */ addiu $s0, $s0, 4 -/* A3A2E8 80240E08 0220202D */ daddu $a0, $s1, $zero -/* A3A2EC 80240E0C 0C0B1EAF */ jal get_variable -/* A3A2F0 80240E10 0280282D */ daddu $a1, $s4, $zero -/* A3A2F4 80240E14 4482D000 */ mtc1 $v0, $f26 -/* A3A2F8 80240E18 00000000 */ nop -/* A3A2FC 80240E1C 4680D6A0 */ cvt.s.w $f26, $f26 -/* A3A300 80240E20 8E100000 */ lw $s0, ($s0) -/* A3A304 80240E24 0220202D */ daddu $a0, $s1, $zero -/* A3A308 80240E28 0C0B1EAF */ jal get_variable -/* A3A30C 80240E2C 0200282D */ daddu $a1, $s0, $zero -/* A3A310 80240E30 4482C000 */ mtc1 $v0, $f24 -/* A3A314 80240E34 00000000 */ nop -/* A3A318 80240E38 4680C620 */ cvt.s.w $f24, $f24 -/* A3A31C 80240E3C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* A3A320 80240E40 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* A3A324 80240E44 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A3A328 80240E48 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A3A32C 80240E4C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* A3A330 80240E50 44800000 */ mtc1 $zero, $f0 -/* A3A334 80240E54 00031080 */ sll $v0, $v1, 2 -/* A3A338 80240E58 00431021 */ addu $v0, $v0, $v1 -/* A3A33C 80240E5C 00021080 */ sll $v0, $v0, 2 -/* A3A340 80240E60 00431023 */ subu $v0, $v0, $v1 -/* A3A344 80240E64 000218C0 */ sll $v1, $v0, 3 -/* A3A348 80240E68 00431021 */ addu $v0, $v0, $v1 -/* A3A34C 80240E6C 000210C0 */ sll $v0, $v0, 3 -/* A3A350 80240E70 46001032 */ c.eq.s $f2, $f0 -/* A3A354 80240E74 3C01800B */ lui $at, 0x800b -/* A3A358 80240E78 00220821 */ addu $at, $at, $v0 -/* A3A35C 80240E7C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* A3A360 80240E80 45000005 */ bc1f .L80240E98 -/* A3A364 80240E84 00000000 */ nop -/* A3A368 80240E88 3C0142C8 */ lui $at, 0x42c8 -/* A3A36C 80240E8C 44810000 */ mtc1 $at, $f0 -/* A3A370 80240E90 080903AA */ j .L80240EA8 -/* A3A374 80240E94 4600B581 */ sub.s $f22, $f22, $f0 -.L80240E98: -/* A3A378 80240E98 3C0142C8 */ lui $at, 0x42c8 -/* A3A37C 80240E9C 44810000 */ mtc1 $at, $f0 -/* A3A380 80240EA0 00000000 */ nop -/* A3A384 80240EA4 4600B580 */ add.s $f22, $f22, $f0 -.L80240EA8: -/* A3A388 80240EA8 0C00A6C9 */ jal clamp_angle -/* A3A38C 80240EAC 4600B306 */ mov.s $f12, $f22 -/* A3A390 80240EB0 46000586 */ mov.s $f22, $f0 -/* A3A394 80240EB4 3C014170 */ lui $at, 0x4170 -/* A3A398 80240EB8 4481A000 */ mtc1 $at, $f20 -/* A3A39C 80240EBC 0C00A8BB */ jal sin_deg -/* A3A3A0 80240EC0 4600B306 */ mov.s $f12, $f22 -/* A3A3A4 80240EC4 46140002 */ mul.s $f0, $f0, $f20 -/* A3A3A8 80240EC8 00000000 */ nop -/* A3A3AC 80240ECC 864200B0 */ lh $v0, 0xb0($s2) -/* A3A3B0 80240ED0 3C013F00 */ lui $at, 0x3f00 -/* A3A3B4 80240ED4 44812000 */ mtc1 $at, $f4 -/* A3A3B8 80240ED8 44821000 */ mtc1 $v0, $f2 -/* A3A3BC 80240EDC 00000000 */ nop -/* A3A3C0 80240EE0 468010A0 */ cvt.s.w $f2, $f2 -/* A3A3C4 80240EE4 46041082 */ mul.s $f2, $f2, $f4 -/* A3A3C8 80240EE8 00000000 */ nop -/* A3A3CC 80240EEC 4600E700 */ add.s $f28, $f28, $f0 -/* A3A3D0 80240EF0 4602D680 */ add.s $f26, $f26, $f2 -/* A3A3D4 80240EF4 0C00A8D4 */ jal cos_deg -/* A3A3D8 80240EF8 4600B306 */ mov.s $f12, $f22 -/* A3A3DC 80240EFC 46140002 */ mul.s $f0, $f0, $f20 -/* A3A3E0 80240F00 00000000 */ nop -/* A3A3E4 80240F04 0220202D */ daddu $a0, $s1, $zero -/* A3A3E8 80240F08 0260282D */ daddu $a1, $s3, $zero -/* A3A3EC 80240F0C 4600E18D */ trunc.w.s $f6, $f28 -/* A3A3F0 80240F10 44063000 */ mfc1 $a2, $f6 -/* A3A3F4 80240F14 0C0B2026 */ jal set_variable -/* A3A3F8 80240F18 4600C601 */ sub.s $f24, $f24, $f0 -/* A3A3FC 80240F1C 0220202D */ daddu $a0, $s1, $zero -/* A3A400 80240F20 4600D18D */ trunc.w.s $f6, $f26 -/* A3A404 80240F24 44063000 */ mfc1 $a2, $f6 -/* A3A408 80240F28 0C0B2026 */ jal set_variable -/* A3A40C 80240F2C 0280282D */ daddu $a1, $s4, $zero -/* A3A410 80240F30 0220202D */ daddu $a0, $s1, $zero -/* A3A414 80240F34 4600C18D */ trunc.w.s $f6, $f24 -/* A3A418 80240F38 44063000 */ mfc1 $a2, $f6 -/* A3A41C 80240F3C 0C0B2026 */ jal set_variable -/* A3A420 80240F40 0200282D */ daddu $a1, $s0, $zero -/* A3A424 80240F44 8FBF0024 */ lw $ra, 0x24($sp) -/* A3A428 80240F48 8FB40020 */ lw $s4, 0x20($sp) -/* A3A42C 80240F4C 8FB3001C */ lw $s3, 0x1c($sp) -/* A3A430 80240F50 8FB20018 */ lw $s2, 0x18($sp) -/* A3A434 80240F54 8FB10014 */ lw $s1, 0x14($sp) -/* A3A438 80240F58 8FB00010 */ lw $s0, 0x10($sp) -/* A3A43C 80240F5C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* A3A440 80240F60 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* A3A444 80240F64 D7B80038 */ ldc1 $f24, 0x38($sp) -/* A3A448 80240F68 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A3A44C 80240F6C D7B40028 */ ldc1 $f20, 0x28($sp) -/* A3A450 80240F70 24020002 */ addiu $v0, $zero, 2 -/* A3A454 80240F74 03E00008 */ jr $ra -/* A3A458 80240F78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241210_91F780.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241210_91F780.s deleted file mode 100644 index 9826005b9a..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241210_91F780.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_91F780 -/* 91F780 80241210 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 91F784 80241214 AFB10014 */ sw $s1, 0x14($sp) -/* 91F788 80241218 0080882D */ daddu $s1, $a0, $zero -/* 91F78C 8024121C AFBF0024 */ sw $ra, 0x24($sp) -/* 91F790 80241220 AFB40020 */ sw $s4, 0x20($sp) -/* 91F794 80241224 AFB3001C */ sw $s3, 0x1c($sp) -/* 91F798 80241228 AFB20018 */ sw $s2, 0x18($sp) -/* 91F79C 8024122C AFB00010 */ sw $s0, 0x10($sp) -/* 91F7A0 80241230 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 91F7A4 80241234 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 91F7A8 80241238 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 91F7AC 8024123C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 91F7B0 80241240 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 91F7B4 80241244 8E30000C */ lw $s0, 0xc($s1) -/* 91F7B8 80241248 8E130000 */ lw $s3, ($s0) -/* 91F7BC 8024124C 26100004 */ addiu $s0, $s0, 4 -/* 91F7C0 80241250 0C0B1EAF */ jal get_variable -/* 91F7C4 80241254 0260282D */ daddu $a1, $s3, $zero -/* 91F7C8 80241258 4482E000 */ mtc1 $v0, $f28 -/* 91F7CC 8024125C 00000000 */ nop -/* 91F7D0 80241260 4680E720 */ cvt.s.w $f28, $f28 -/* 91F7D4 80241264 8E140000 */ lw $s4, ($s0) -/* 91F7D8 80241268 26100004 */ addiu $s0, $s0, 4 -/* 91F7DC 8024126C 0220202D */ daddu $a0, $s1, $zero -/* 91F7E0 80241270 0C0B1EAF */ jal get_variable -/* 91F7E4 80241274 0280282D */ daddu $a1, $s4, $zero -/* 91F7E8 80241278 4482D000 */ mtc1 $v0, $f26 -/* 91F7EC 8024127C 00000000 */ nop -/* 91F7F0 80241280 4680D6A0 */ cvt.s.w $f26, $f26 -/* 91F7F4 80241284 8E100000 */ lw $s0, ($s0) -/* 91F7F8 80241288 0220202D */ daddu $a0, $s1, $zero -/* 91F7FC 8024128C 0C0B1EAF */ jal get_variable -/* 91F800 80241290 0200282D */ daddu $a1, $s0, $zero -/* 91F804 80241294 4482C000 */ mtc1 $v0, $f24 -/* 91F808 80241298 00000000 */ nop -/* 91F80C 8024129C 4680C620 */ cvt.s.w $f24, $f24 -/* 91F810 802412A0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 91F814 802412A4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 91F818 802412A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 91F81C 802412AC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 91F820 802412B0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 91F824 802412B4 44800000 */ mtc1 $zero, $f0 -/* 91F828 802412B8 00031080 */ sll $v0, $v1, 2 -/* 91F82C 802412BC 00431021 */ addu $v0, $v0, $v1 -/* 91F830 802412C0 00021080 */ sll $v0, $v0, 2 -/* 91F834 802412C4 00431023 */ subu $v0, $v0, $v1 -/* 91F838 802412C8 000218C0 */ sll $v1, $v0, 3 -/* 91F83C 802412CC 00431021 */ addu $v0, $v0, $v1 -/* 91F840 802412D0 000210C0 */ sll $v0, $v0, 3 -/* 91F844 802412D4 46001032 */ c.eq.s $f2, $f0 -/* 91F848 802412D8 3C01800B */ lui $at, 0x800b -/* 91F84C 802412DC 00220821 */ addu $at, $at, $v0 -/* 91F850 802412E0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 91F854 802412E4 45000005 */ bc1f .L802412FC -/* 91F858 802412E8 00000000 */ nop -/* 91F85C 802412EC 3C0142C8 */ lui $at, 0x42c8 -/* 91F860 802412F0 44810000 */ mtc1 $at, $f0 -/* 91F864 802412F4 080904C3 */ j .L8024130C -/* 91F868 802412F8 4600B581 */ sub.s $f22, $f22, $f0 -.L802412FC: -/* 91F86C 802412FC 3C0142C8 */ lui $at, 0x42c8 -/* 91F870 80241300 44810000 */ mtc1 $at, $f0 -/* 91F874 80241304 00000000 */ nop -/* 91F878 80241308 4600B580 */ add.s $f22, $f22, $f0 -.L8024130C: -/* 91F87C 8024130C 0C00A6C9 */ jal clamp_angle -/* 91F880 80241310 4600B306 */ mov.s $f12, $f22 -/* 91F884 80241314 46000586 */ mov.s $f22, $f0 -/* 91F888 80241318 3C014170 */ lui $at, 0x4170 -/* 91F88C 8024131C 4481A000 */ mtc1 $at, $f20 -/* 91F890 80241320 0C00A8BB */ jal sin_deg -/* 91F894 80241324 4600B306 */ mov.s $f12, $f22 -/* 91F898 80241328 46140002 */ mul.s $f0, $f0, $f20 -/* 91F89C 8024132C 00000000 */ nop -/* 91F8A0 80241330 864200B0 */ lh $v0, 0xb0($s2) -/* 91F8A4 80241334 3C013F00 */ lui $at, 0x3f00 -/* 91F8A8 80241338 44812000 */ mtc1 $at, $f4 -/* 91F8AC 8024133C 44821000 */ mtc1 $v0, $f2 -/* 91F8B0 80241340 00000000 */ nop -/* 91F8B4 80241344 468010A0 */ cvt.s.w $f2, $f2 -/* 91F8B8 80241348 46041082 */ mul.s $f2, $f2, $f4 -/* 91F8BC 8024134C 00000000 */ nop -/* 91F8C0 80241350 4600E700 */ add.s $f28, $f28, $f0 -/* 91F8C4 80241354 4602D680 */ add.s $f26, $f26, $f2 -/* 91F8C8 80241358 0C00A8D4 */ jal cos_deg -/* 91F8CC 8024135C 4600B306 */ mov.s $f12, $f22 -/* 91F8D0 80241360 46140002 */ mul.s $f0, $f0, $f20 -/* 91F8D4 80241364 00000000 */ nop -/* 91F8D8 80241368 0220202D */ daddu $a0, $s1, $zero -/* 91F8DC 8024136C 0260282D */ daddu $a1, $s3, $zero -/* 91F8E0 80241370 4600E18D */ trunc.w.s $f6, $f28 -/* 91F8E4 80241374 44063000 */ mfc1 $a2, $f6 -/* 91F8E8 80241378 0C0B2026 */ jal set_variable -/* 91F8EC 8024137C 4600C601 */ sub.s $f24, $f24, $f0 -/* 91F8F0 80241380 0220202D */ daddu $a0, $s1, $zero -/* 91F8F4 80241384 4600D18D */ trunc.w.s $f6, $f26 -/* 91F8F8 80241388 44063000 */ mfc1 $a2, $f6 -/* 91F8FC 8024138C 0C0B2026 */ jal set_variable -/* 91F900 80241390 0280282D */ daddu $a1, $s4, $zero -/* 91F904 80241394 0220202D */ daddu $a0, $s1, $zero -/* 91F908 80241398 4600C18D */ trunc.w.s $f6, $f24 -/* 91F90C 8024139C 44063000 */ mfc1 $a2, $f6 -/* 91F910 802413A0 0C0B2026 */ jal set_variable -/* 91F914 802413A4 0200282D */ daddu $a1, $s0, $zero -/* 91F918 802413A8 8FBF0024 */ lw $ra, 0x24($sp) -/* 91F91C 802413AC 8FB40020 */ lw $s4, 0x20($sp) -/* 91F920 802413B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 91F924 802413B4 8FB20018 */ lw $s2, 0x18($sp) -/* 91F928 802413B8 8FB10014 */ lw $s1, 0x14($sp) -/* 91F92C 802413BC 8FB00010 */ lw $s0, 0x10($sp) -/* 91F930 802413C0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 91F934 802413C4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 91F938 802413C8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 91F93C 802413CC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 91F940 802413D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 91F944 802413D4 24020002 */ addiu $v0, $zero, 2 -/* 91F948 802413D8 03E00008 */ jr $ra -/* 91F94C 802413DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240568_B20AA8.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240568_B20AA8.s deleted file mode 100644 index 68d3c53c81..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240568_B20AA8.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_B20AA8 -/* B20AA8 80240568 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B20AAC 8024056C AFB10014 */ sw $s1, 0x14($sp) -/* B20AB0 80240570 0080882D */ daddu $s1, $a0, $zero -/* B20AB4 80240574 AFBF0024 */ sw $ra, 0x24($sp) -/* B20AB8 80240578 AFB40020 */ sw $s4, 0x20($sp) -/* B20ABC 8024057C AFB3001C */ sw $s3, 0x1c($sp) -/* B20AC0 80240580 AFB20018 */ sw $s2, 0x18($sp) -/* B20AC4 80240584 AFB00010 */ sw $s0, 0x10($sp) -/* B20AC8 80240588 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* B20ACC 8024058C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* B20AD0 80240590 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B20AD4 80240594 F7B60030 */ sdc1 $f22, 0x30($sp) -/* B20AD8 80240598 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B20ADC 8024059C 8E30000C */ lw $s0, 0xc($s1) -/* B20AE0 802405A0 8E130000 */ lw $s3, ($s0) -/* B20AE4 802405A4 26100004 */ addiu $s0, $s0, 4 -/* B20AE8 802405A8 0C0B1EAF */ jal get_variable -/* B20AEC 802405AC 0260282D */ daddu $a1, $s3, $zero -/* B20AF0 802405B0 4482E000 */ mtc1 $v0, $f28 -/* B20AF4 802405B4 00000000 */ nop -/* B20AF8 802405B8 4680E720 */ cvt.s.w $f28, $f28 -/* B20AFC 802405BC 8E140000 */ lw $s4, ($s0) -/* B20B00 802405C0 26100004 */ addiu $s0, $s0, 4 -/* B20B04 802405C4 0220202D */ daddu $a0, $s1, $zero -/* B20B08 802405C8 0C0B1EAF */ jal get_variable -/* B20B0C 802405CC 0280282D */ daddu $a1, $s4, $zero -/* B20B10 802405D0 4482D000 */ mtc1 $v0, $f26 -/* B20B14 802405D4 00000000 */ nop -/* B20B18 802405D8 4680D6A0 */ cvt.s.w $f26, $f26 -/* B20B1C 802405DC 8E100000 */ lw $s0, ($s0) -/* B20B20 802405E0 0220202D */ daddu $a0, $s1, $zero -/* B20B24 802405E4 0C0B1EAF */ jal get_variable -/* B20B28 802405E8 0200282D */ daddu $a1, $s0, $zero -/* B20B2C 802405EC 4482C000 */ mtc1 $v0, $f24 -/* B20B30 802405F0 00000000 */ nop -/* B20B34 802405F4 4680C620 */ cvt.s.w $f24, $f24 -/* B20B38 802405F8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* B20B3C 802405FC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* B20B40 80240600 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B20B44 80240604 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B20B48 80240608 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* B20B4C 8024060C 44800000 */ mtc1 $zero, $f0 -/* B20B50 80240610 00031080 */ sll $v0, $v1, 2 -/* B20B54 80240614 00431021 */ addu $v0, $v0, $v1 -/* B20B58 80240618 00021080 */ sll $v0, $v0, 2 -/* B20B5C 8024061C 00431023 */ subu $v0, $v0, $v1 -/* B20B60 80240620 000218C0 */ sll $v1, $v0, 3 -/* B20B64 80240624 00431021 */ addu $v0, $v0, $v1 -/* B20B68 80240628 000210C0 */ sll $v0, $v0, 3 -/* B20B6C 8024062C 46001032 */ c.eq.s $f2, $f0 -/* B20B70 80240630 3C01800B */ lui $at, 0x800b -/* B20B74 80240634 00220821 */ addu $at, $at, $v0 -/* B20B78 80240638 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B20B7C 8024063C 45000005 */ bc1f .L80240654 -/* B20B80 80240640 00000000 */ nop -/* B20B84 80240644 3C0142C8 */ lui $at, 0x42c8 -/* B20B88 80240648 44810000 */ mtc1 $at, $f0 -/* B20B8C 8024064C 08090199 */ j .L80240664 -/* B20B90 80240650 4600B581 */ sub.s $f22, $f22, $f0 -.L80240654: -/* B20B94 80240654 3C0142C8 */ lui $at, 0x42c8 -/* B20B98 80240658 44810000 */ mtc1 $at, $f0 -/* B20B9C 8024065C 00000000 */ nop -/* B20BA0 80240660 4600B580 */ add.s $f22, $f22, $f0 -.L80240664: -/* B20BA4 80240664 0C00A6C9 */ jal clamp_angle -/* B20BA8 80240668 4600B306 */ mov.s $f12, $f22 -/* B20BAC 8024066C 46000586 */ mov.s $f22, $f0 -/* B20BB0 80240670 3C014170 */ lui $at, 0x4170 -/* B20BB4 80240674 4481A000 */ mtc1 $at, $f20 -/* B20BB8 80240678 0C00A8BB */ jal sin_deg -/* B20BBC 8024067C 4600B306 */ mov.s $f12, $f22 -/* B20BC0 80240680 46140002 */ mul.s $f0, $f0, $f20 -/* B20BC4 80240684 00000000 */ nop -/* B20BC8 80240688 864200B0 */ lh $v0, 0xb0($s2) -/* B20BCC 8024068C 3C013F00 */ lui $at, 0x3f00 -/* B20BD0 80240690 44812000 */ mtc1 $at, $f4 -/* B20BD4 80240694 44821000 */ mtc1 $v0, $f2 -/* B20BD8 80240698 00000000 */ nop -/* B20BDC 8024069C 468010A0 */ cvt.s.w $f2, $f2 -/* B20BE0 802406A0 46041082 */ mul.s $f2, $f2, $f4 -/* B20BE4 802406A4 00000000 */ nop -/* B20BE8 802406A8 4600E700 */ add.s $f28, $f28, $f0 -/* B20BEC 802406AC 4602D680 */ add.s $f26, $f26, $f2 -/* B20BF0 802406B0 0C00A8D4 */ jal cos_deg -/* B20BF4 802406B4 4600B306 */ mov.s $f12, $f22 -/* B20BF8 802406B8 46140002 */ mul.s $f0, $f0, $f20 -/* B20BFC 802406BC 00000000 */ nop -/* B20C00 802406C0 0220202D */ daddu $a0, $s1, $zero -/* B20C04 802406C4 0260282D */ daddu $a1, $s3, $zero -/* B20C08 802406C8 4600E18D */ trunc.w.s $f6, $f28 -/* B20C0C 802406CC 44063000 */ mfc1 $a2, $f6 -/* B20C10 802406D0 0C0B2026 */ jal set_variable -/* B20C14 802406D4 4600C601 */ sub.s $f24, $f24, $f0 -/* B20C18 802406D8 0220202D */ daddu $a0, $s1, $zero -/* B20C1C 802406DC 4600D18D */ trunc.w.s $f6, $f26 -/* B20C20 802406E0 44063000 */ mfc1 $a2, $f6 -/* B20C24 802406E4 0C0B2026 */ jal set_variable -/* B20C28 802406E8 0280282D */ daddu $a1, $s4, $zero -/* B20C2C 802406EC 0220202D */ daddu $a0, $s1, $zero -/* B20C30 802406F0 4600C18D */ trunc.w.s $f6, $f24 -/* B20C34 802406F4 44063000 */ mfc1 $a2, $f6 -/* B20C38 802406F8 0C0B2026 */ jal set_variable -/* B20C3C 802406FC 0200282D */ daddu $a1, $s0, $zero -/* B20C40 80240700 8FBF0024 */ lw $ra, 0x24($sp) -/* B20C44 80240704 8FB40020 */ lw $s4, 0x20($sp) -/* B20C48 80240708 8FB3001C */ lw $s3, 0x1c($sp) -/* B20C4C 8024070C 8FB20018 */ lw $s2, 0x18($sp) -/* B20C50 80240710 8FB10014 */ lw $s1, 0x14($sp) -/* B20C54 80240714 8FB00010 */ lw $s0, 0x10($sp) -/* B20C58 80240718 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* B20C5C 8024071C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* B20C60 80240720 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B20C64 80240724 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B20C68 80240728 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B20C6C 8024072C 24020002 */ addiu $v0, $zero, 2 -/* B20C70 80240730 03E00008 */ jr $ra -/* B20C74 80240734 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024131C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024131C.s deleted file mode 100644 index 2f6fcdc8de..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024131C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024131C -/* B2D78C 8024131C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B2D790 80241320 AFB10014 */ sw $s1, 0x14($sp) -/* B2D794 80241324 0080882D */ daddu $s1, $a0, $zero -/* B2D798 80241328 AFBF0024 */ sw $ra, 0x24($sp) -/* B2D79C 8024132C AFB40020 */ sw $s4, 0x20($sp) -/* B2D7A0 80241330 AFB3001C */ sw $s3, 0x1c($sp) -/* B2D7A4 80241334 AFB20018 */ sw $s2, 0x18($sp) -/* B2D7A8 80241338 AFB00010 */ sw $s0, 0x10($sp) -/* B2D7AC 8024133C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* B2D7B0 80241340 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* B2D7B4 80241344 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B2D7B8 80241348 F7B60030 */ sdc1 $f22, 0x30($sp) -/* B2D7BC 8024134C F7B40028 */ sdc1 $f20, 0x28($sp) -/* B2D7C0 80241350 8E30000C */ lw $s0, 0xc($s1) -/* B2D7C4 80241354 8E130000 */ lw $s3, ($s0) -/* B2D7C8 80241358 26100004 */ addiu $s0, $s0, 4 -/* B2D7CC 8024135C 0C0B1EAF */ jal get_variable -/* B2D7D0 80241360 0260282D */ daddu $a1, $s3, $zero -/* B2D7D4 80241364 4482E000 */ mtc1 $v0, $f28 -/* B2D7D8 80241368 00000000 */ nop -/* B2D7DC 8024136C 4680E720 */ cvt.s.w $f28, $f28 -/* B2D7E0 80241370 8E140000 */ lw $s4, ($s0) -/* B2D7E4 80241374 26100004 */ addiu $s0, $s0, 4 -/* B2D7E8 80241378 0220202D */ daddu $a0, $s1, $zero -/* B2D7EC 8024137C 0C0B1EAF */ jal get_variable -/* B2D7F0 80241380 0280282D */ daddu $a1, $s4, $zero -/* B2D7F4 80241384 4482D000 */ mtc1 $v0, $f26 -/* B2D7F8 80241388 00000000 */ nop -/* B2D7FC 8024138C 4680D6A0 */ cvt.s.w $f26, $f26 -/* B2D800 80241390 8E100000 */ lw $s0, ($s0) -/* B2D804 80241394 0220202D */ daddu $a0, $s1, $zero -/* B2D808 80241398 0C0B1EAF */ jal get_variable -/* B2D80C 8024139C 0200282D */ daddu $a1, $s0, $zero -/* B2D810 802413A0 4482C000 */ mtc1 $v0, $f24 -/* B2D814 802413A4 00000000 */ nop -/* B2D818 802413A8 4680C620 */ cvt.s.w $f24, $f24 -/* B2D81C 802413AC 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* B2D820 802413B0 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* B2D824 802413B4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B2D828 802413B8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B2D82C 802413BC C64200A8 */ lwc1 $f2, 0xa8($s2) -/* B2D830 802413C0 44800000 */ mtc1 $zero, $f0 -/* B2D834 802413C4 00031080 */ sll $v0, $v1, 2 -/* B2D838 802413C8 00431021 */ addu $v0, $v0, $v1 -/* B2D83C 802413CC 00021080 */ sll $v0, $v0, 2 -/* B2D840 802413D0 00431023 */ subu $v0, $v0, $v1 -/* B2D844 802413D4 000218C0 */ sll $v1, $v0, 3 -/* B2D848 802413D8 00431021 */ addu $v0, $v0, $v1 -/* B2D84C 802413DC 000210C0 */ sll $v0, $v0, 3 -/* B2D850 802413E0 46001032 */ c.eq.s $f2, $f0 -/* B2D854 802413E4 3C01800B */ lui $at, 0x800b -/* B2D858 802413E8 00220821 */ addu $at, $at, $v0 -/* B2D85C 802413EC C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B2D860 802413F0 45000005 */ bc1f .L80241408 -/* B2D864 802413F4 00000000 */ nop -/* B2D868 802413F8 3C0142C8 */ lui $at, 0x42c8 -/* B2D86C 802413FC 44810000 */ mtc1 $at, $f0 -/* B2D870 80241400 08090506 */ j .L80241418 -/* B2D874 80241404 4600B581 */ sub.s $f22, $f22, $f0 -.L80241408: -/* B2D878 80241408 3C0142C8 */ lui $at, 0x42c8 -/* B2D87C 8024140C 44810000 */ mtc1 $at, $f0 -/* B2D880 80241410 00000000 */ nop -/* B2D884 80241414 4600B580 */ add.s $f22, $f22, $f0 -.L80241418: -/* B2D888 80241418 0C00A6C9 */ jal clamp_angle -/* B2D88C 8024141C 4600B306 */ mov.s $f12, $f22 -/* B2D890 80241420 46000586 */ mov.s $f22, $f0 -/* B2D894 80241424 3C014170 */ lui $at, 0x4170 -/* B2D898 80241428 4481A000 */ mtc1 $at, $f20 -/* B2D89C 8024142C 0C00A8BB */ jal sin_deg -/* B2D8A0 80241430 4600B306 */ mov.s $f12, $f22 -/* B2D8A4 80241434 46140002 */ mul.s $f0, $f0, $f20 -/* B2D8A8 80241438 00000000 */ nop -/* B2D8AC 8024143C 864200B0 */ lh $v0, 0xb0($s2) -/* B2D8B0 80241440 3C013F00 */ lui $at, 0x3f00 -/* B2D8B4 80241444 44812000 */ mtc1 $at, $f4 -/* B2D8B8 80241448 44821000 */ mtc1 $v0, $f2 -/* B2D8BC 8024144C 00000000 */ nop -/* B2D8C0 80241450 468010A0 */ cvt.s.w $f2, $f2 -/* B2D8C4 80241454 46041082 */ mul.s $f2, $f2, $f4 -/* B2D8C8 80241458 00000000 */ nop -/* B2D8CC 8024145C 4600E700 */ add.s $f28, $f28, $f0 -/* B2D8D0 80241460 4602D680 */ add.s $f26, $f26, $f2 -/* B2D8D4 80241464 0C00A8D4 */ jal cos_deg -/* B2D8D8 80241468 4600B306 */ mov.s $f12, $f22 -/* B2D8DC 8024146C 46140002 */ mul.s $f0, $f0, $f20 -/* B2D8E0 80241470 00000000 */ nop -/* B2D8E4 80241474 0220202D */ daddu $a0, $s1, $zero -/* B2D8E8 80241478 0260282D */ daddu $a1, $s3, $zero -/* B2D8EC 8024147C 4600E18D */ trunc.w.s $f6, $f28 -/* B2D8F0 80241480 44063000 */ mfc1 $a2, $f6 -/* B2D8F4 80241484 0C0B2026 */ jal set_variable -/* B2D8F8 80241488 4600C601 */ sub.s $f24, $f24, $f0 -/* B2D8FC 8024148C 0220202D */ daddu $a0, $s1, $zero -/* B2D900 80241490 4600D18D */ trunc.w.s $f6, $f26 -/* B2D904 80241494 44063000 */ mfc1 $a2, $f6 -/* B2D908 80241498 0C0B2026 */ jal set_variable -/* B2D90C 8024149C 0280282D */ daddu $a1, $s4, $zero -/* B2D910 802414A0 0220202D */ daddu $a0, $s1, $zero -/* B2D914 802414A4 4600C18D */ trunc.w.s $f6, $f24 -/* B2D918 802414A8 44063000 */ mfc1 $a2, $f6 -/* B2D91C 802414AC 0C0B2026 */ jal set_variable -/* B2D920 802414B0 0200282D */ daddu $a1, $s0, $zero -/* B2D924 802414B4 8FBF0024 */ lw $ra, 0x24($sp) -/* B2D928 802414B8 8FB40020 */ lw $s4, 0x20($sp) -/* B2D92C 802414BC 8FB3001C */ lw $s3, 0x1c($sp) -/* B2D930 802414C0 8FB20018 */ lw $s2, 0x18($sp) -/* B2D934 802414C4 8FB10014 */ lw $s1, 0x14($sp) -/* B2D938 802414C8 8FB00010 */ lw $s0, 0x10($sp) -/* B2D93C 802414CC D7BC0048 */ ldc1 $f28, 0x48($sp) -/* B2D940 802414D0 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* B2D944 802414D4 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B2D948 802414D8 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B2D94C 802414DC D7B40028 */ ldc1 $f20, 0x28($sp) -/* B2D950 802414E0 24020002 */ addiu $v0, $zero, 2 -/* B2D954 802414E4 03E00008 */ jr $ra -/* B2D958 802414E8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241808.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241808.s deleted file mode 100644 index a411f3df2b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241808.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241808 -/* B363D8 80241808 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B363DC 8024180C AFB10014 */ sw $s1, 0x14($sp) -/* B363E0 80241810 0080882D */ daddu $s1, $a0, $zero -/* B363E4 80241814 AFBF0024 */ sw $ra, 0x24($sp) -/* B363E8 80241818 AFB40020 */ sw $s4, 0x20($sp) -/* B363EC 8024181C AFB3001C */ sw $s3, 0x1c($sp) -/* B363F0 80241820 AFB20018 */ sw $s2, 0x18($sp) -/* B363F4 80241824 AFB00010 */ sw $s0, 0x10($sp) -/* B363F8 80241828 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* B363FC 8024182C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* B36400 80241830 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B36404 80241834 F7B60030 */ sdc1 $f22, 0x30($sp) -/* B36408 80241838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B3640C 8024183C 8E30000C */ lw $s0, 0xc($s1) -/* B36410 80241840 8E130000 */ lw $s3, ($s0) -/* B36414 80241844 26100004 */ addiu $s0, $s0, 4 -/* B36418 80241848 0C0B1EAF */ jal get_variable -/* B3641C 8024184C 0260282D */ daddu $a1, $s3, $zero -/* B36420 80241850 4482E000 */ mtc1 $v0, $f28 -/* B36424 80241854 00000000 */ nop -/* B36428 80241858 4680E720 */ cvt.s.w $f28, $f28 -/* B3642C 8024185C 8E140000 */ lw $s4, ($s0) -/* B36430 80241860 26100004 */ addiu $s0, $s0, 4 -/* B36434 80241864 0220202D */ daddu $a0, $s1, $zero -/* B36438 80241868 0C0B1EAF */ jal get_variable -/* B3643C 8024186C 0280282D */ daddu $a1, $s4, $zero -/* B36440 80241870 4482D000 */ mtc1 $v0, $f26 -/* B36444 80241874 00000000 */ nop -/* B36448 80241878 4680D6A0 */ cvt.s.w $f26, $f26 -/* B3644C 8024187C 8E100000 */ lw $s0, ($s0) -/* B36450 80241880 0220202D */ daddu $a0, $s1, $zero -/* B36454 80241884 0C0B1EAF */ jal get_variable -/* B36458 80241888 0200282D */ daddu $a1, $s0, $zero -/* B3645C 8024188C 4482C000 */ mtc1 $v0, $f24 -/* B36460 80241890 00000000 */ nop -/* B36464 80241894 4680C620 */ cvt.s.w $f24, $f24 -/* B36468 80241898 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* B3646C 8024189C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* B36470 802418A0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B36474 802418A4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B36478 802418A8 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* B3647C 802418AC 44800000 */ mtc1 $zero, $f0 -/* B36480 802418B0 00031080 */ sll $v0, $v1, 2 -/* B36484 802418B4 00431021 */ addu $v0, $v0, $v1 -/* B36488 802418B8 00021080 */ sll $v0, $v0, 2 -/* B3648C 802418BC 00431023 */ subu $v0, $v0, $v1 -/* B36490 802418C0 000218C0 */ sll $v1, $v0, 3 -/* B36494 802418C4 00431021 */ addu $v0, $v0, $v1 -/* B36498 802418C8 000210C0 */ sll $v0, $v0, 3 -/* B3649C 802418CC 46001032 */ c.eq.s $f2, $f0 -/* B364A0 802418D0 3C01800B */ lui $at, 0x800b -/* B364A4 802418D4 00220821 */ addu $at, $at, $v0 -/* B364A8 802418D8 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B364AC 802418DC 45000005 */ bc1f .L802418F4 -/* B364B0 802418E0 00000000 */ nop -/* B364B4 802418E4 3C0142C8 */ lui $at, 0x42c8 -/* B364B8 802418E8 44810000 */ mtc1 $at, $f0 -/* B364BC 802418EC 08090641 */ j .L80241904 -/* B364C0 802418F0 4600B581 */ sub.s $f22, $f22, $f0 -.L802418F4: -/* B364C4 802418F4 3C0142C8 */ lui $at, 0x42c8 -/* B364C8 802418F8 44810000 */ mtc1 $at, $f0 -/* B364CC 802418FC 00000000 */ nop -/* B364D0 80241900 4600B580 */ add.s $f22, $f22, $f0 -.L80241904: -/* B364D4 80241904 0C00A6C9 */ jal clamp_angle -/* B364D8 80241908 4600B306 */ mov.s $f12, $f22 -/* B364DC 8024190C 46000586 */ mov.s $f22, $f0 -/* B364E0 80241910 3C014170 */ lui $at, 0x4170 -/* B364E4 80241914 4481A000 */ mtc1 $at, $f20 -/* B364E8 80241918 0C00A8BB */ jal sin_deg -/* B364EC 8024191C 4600B306 */ mov.s $f12, $f22 -/* B364F0 80241920 46140002 */ mul.s $f0, $f0, $f20 -/* B364F4 80241924 00000000 */ nop -/* B364F8 80241928 864200B0 */ lh $v0, 0xb0($s2) -/* B364FC 8024192C 3C013F00 */ lui $at, 0x3f00 -/* B36500 80241930 44812000 */ mtc1 $at, $f4 -/* B36504 80241934 44821000 */ mtc1 $v0, $f2 -/* B36508 80241938 00000000 */ nop -/* B3650C 8024193C 468010A0 */ cvt.s.w $f2, $f2 -/* B36510 80241940 46041082 */ mul.s $f2, $f2, $f4 -/* B36514 80241944 00000000 */ nop -/* B36518 80241948 4600E700 */ add.s $f28, $f28, $f0 -/* B3651C 8024194C 4602D680 */ add.s $f26, $f26, $f2 -/* B36520 80241950 0C00A8D4 */ jal cos_deg -/* B36524 80241954 4600B306 */ mov.s $f12, $f22 -/* B36528 80241958 46140002 */ mul.s $f0, $f0, $f20 -/* B3652C 8024195C 00000000 */ nop -/* B36530 80241960 0220202D */ daddu $a0, $s1, $zero -/* B36534 80241964 0260282D */ daddu $a1, $s3, $zero -/* B36538 80241968 4600E18D */ trunc.w.s $f6, $f28 -/* B3653C 8024196C 44063000 */ mfc1 $a2, $f6 -/* B36540 80241970 0C0B2026 */ jal set_variable -/* B36544 80241974 4600C601 */ sub.s $f24, $f24, $f0 -/* B36548 80241978 0220202D */ daddu $a0, $s1, $zero -/* B3654C 8024197C 4600D18D */ trunc.w.s $f6, $f26 -/* B36550 80241980 44063000 */ mfc1 $a2, $f6 -/* B36554 80241984 0C0B2026 */ jal set_variable -/* B36558 80241988 0280282D */ daddu $a1, $s4, $zero -/* B3655C 8024198C 0220202D */ daddu $a0, $s1, $zero -/* B36560 80241990 4600C18D */ trunc.w.s $f6, $f24 -/* B36564 80241994 44063000 */ mfc1 $a2, $f6 -/* B36568 80241998 0C0B2026 */ jal set_variable -/* B3656C 8024199C 0200282D */ daddu $a1, $s0, $zero -/* B36570 802419A0 8FBF0024 */ lw $ra, 0x24($sp) -/* B36574 802419A4 8FB40020 */ lw $s4, 0x20($sp) -/* B36578 802419A8 8FB3001C */ lw $s3, 0x1c($sp) -/* B3657C 802419AC 8FB20018 */ lw $s2, 0x18($sp) -/* B36580 802419B0 8FB10014 */ lw $s1, 0x14($sp) -/* B36584 802419B4 8FB00010 */ lw $s0, 0x10($sp) -/* B36588 802419B8 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* B3658C 802419BC D7BA0040 */ ldc1 $f26, 0x40($sp) -/* B36590 802419C0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B36594 802419C4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B36598 802419C8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B3659C 802419CC 24020002 */ addiu $v0, $zero, 2 -/* B365A0 802419D0 03E00008 */ jr $ra -/* B365A4 802419D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790.s b/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790.s index d35ab6abbc..31b03ac525 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790.s @@ -55,7 +55,7 @@ glabel func_80241790 /* B859D8 80241858 4405E000 */ mfc1 $a1, $f28 /* B859DC 8024185C 4406D000 */ mfc1 $a2, $f26 /* B859E0 80241860 4407C000 */ mfc1 $a3, $f24 -/* B859E4 80241864 0C0905C8 */ jal func_80241720 +/* B859E4 80241864 0C0905C8 */ jal func_80241720_B858A0 /* B859E8 80241868 27A40010 */ addiu $a0, $sp, 0x10 /* B859EC 8024186C 27A40010 */ addiu $a0, $sp, 0x10 /* B859F0 80241870 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241790 /* B85A60 802418E0 4405E000 */ mfc1 $a1, $f28 /* B85A64 802418E4 4406D000 */ mfc1 $a2, $f26 /* B85A68 802418E8 4407C000 */ mfc1 $a3, $f24 -/* B85A6C 802418EC 0C0905C8 */ jal func_80241720 +/* B85A6C 802418EC 0C0905C8 */ jal func_80241720_B858A0 /* B85A70 802418F0 27A40010 */ addiu $a0, $sp, 0x10 /* B85A74 802418F4 27A40010 */ addiu $a0, $sp, 0x10 /* B85A78 802418F8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024039C.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024039C.s deleted file mode 100644 index 8036060703..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024039C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024039C -/* AF303C 8024039C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AF3040 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* AF3044 802403A4 0080882D */ daddu $s1, $a0, $zero -/* AF3048 802403A8 AFBF0024 */ sw $ra, 0x24($sp) -/* AF304C 802403AC AFB40020 */ sw $s4, 0x20($sp) -/* AF3050 802403B0 AFB3001C */ sw $s3, 0x1c($sp) -/* AF3054 802403B4 AFB20018 */ sw $s2, 0x18($sp) -/* AF3058 802403B8 AFB00010 */ sw $s0, 0x10($sp) -/* AF305C 802403BC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* AF3060 802403C0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* AF3064 802403C4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* AF3068 802403C8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* AF306C 802403CC F7B40028 */ sdc1 $f20, 0x28($sp) -/* AF3070 802403D0 8E30000C */ lw $s0, 0xc($s1) -/* AF3074 802403D4 8E130000 */ lw $s3, ($s0) -/* AF3078 802403D8 26100004 */ addiu $s0, $s0, 4 -/* AF307C 802403DC 0C0B1EAF */ jal get_variable -/* AF3080 802403E0 0260282D */ daddu $a1, $s3, $zero -/* AF3084 802403E4 4482E000 */ mtc1 $v0, $f28 -/* AF3088 802403E8 00000000 */ nop -/* AF308C 802403EC 4680E720 */ cvt.s.w $f28, $f28 -/* AF3090 802403F0 8E140000 */ lw $s4, ($s0) -/* AF3094 802403F4 26100004 */ addiu $s0, $s0, 4 -/* AF3098 802403F8 0220202D */ daddu $a0, $s1, $zero -/* AF309C 802403FC 0C0B1EAF */ jal get_variable -/* AF30A0 80240400 0280282D */ daddu $a1, $s4, $zero -/* AF30A4 80240404 4482D000 */ mtc1 $v0, $f26 -/* AF30A8 80240408 00000000 */ nop -/* AF30AC 8024040C 4680D6A0 */ cvt.s.w $f26, $f26 -/* AF30B0 80240410 8E100000 */ lw $s0, ($s0) -/* AF30B4 80240414 0220202D */ daddu $a0, $s1, $zero -/* AF30B8 80240418 0C0B1EAF */ jal get_variable -/* AF30BC 8024041C 0200282D */ daddu $a1, $s0, $zero -/* AF30C0 80240420 4482C000 */ mtc1 $v0, $f24 -/* AF30C4 80240424 00000000 */ nop -/* AF30C8 80240428 4680C620 */ cvt.s.w $f24, $f24 -/* AF30CC 8024042C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AF30D0 80240430 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AF30D4 80240434 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* AF30D8 80240438 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* AF30DC 8024043C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* AF30E0 80240440 44800000 */ mtc1 $zero, $f0 -/* AF30E4 80240444 00031080 */ sll $v0, $v1, 2 -/* AF30E8 80240448 00431021 */ addu $v0, $v0, $v1 -/* AF30EC 8024044C 00021080 */ sll $v0, $v0, 2 -/* AF30F0 80240450 00431023 */ subu $v0, $v0, $v1 -/* AF30F4 80240454 000218C0 */ sll $v1, $v0, 3 -/* AF30F8 80240458 00431021 */ addu $v0, $v0, $v1 -/* AF30FC 8024045C 000210C0 */ sll $v0, $v0, 3 -/* AF3100 80240460 46001032 */ c.eq.s $f2, $f0 -/* AF3104 80240464 3C01800B */ lui $at, 0x800b -/* AF3108 80240468 00220821 */ addu $at, $at, $v0 -/* AF310C 8024046C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* AF3110 80240470 45000005 */ bc1f .L80240488 -/* AF3114 80240474 00000000 */ nop -/* AF3118 80240478 3C0142C8 */ lui $at, 0x42c8 -/* AF311C 8024047C 44810000 */ mtc1 $at, $f0 -/* AF3120 80240480 08090126 */ j .L80240498 -/* AF3124 80240484 4600B581 */ sub.s $f22, $f22, $f0 -.L80240488: -/* AF3128 80240488 3C0142C8 */ lui $at, 0x42c8 -/* AF312C 8024048C 44810000 */ mtc1 $at, $f0 -/* AF3130 80240490 00000000 */ nop -/* AF3134 80240494 4600B580 */ add.s $f22, $f22, $f0 -.L80240498: -/* AF3138 80240498 0C00A6C9 */ jal clamp_angle -/* AF313C 8024049C 4600B306 */ mov.s $f12, $f22 -/* AF3140 802404A0 46000586 */ mov.s $f22, $f0 -/* AF3144 802404A4 3C014170 */ lui $at, 0x4170 -/* AF3148 802404A8 4481A000 */ mtc1 $at, $f20 -/* AF314C 802404AC 0C00A8BB */ jal sin_deg -/* AF3150 802404B0 4600B306 */ mov.s $f12, $f22 -/* AF3154 802404B4 46140002 */ mul.s $f0, $f0, $f20 -/* AF3158 802404B8 00000000 */ nop -/* AF315C 802404BC 864200B0 */ lh $v0, 0xb0($s2) -/* AF3160 802404C0 3C013F00 */ lui $at, 0x3f00 -/* AF3164 802404C4 44812000 */ mtc1 $at, $f4 -/* AF3168 802404C8 44821000 */ mtc1 $v0, $f2 -/* AF316C 802404CC 00000000 */ nop -/* AF3170 802404D0 468010A0 */ cvt.s.w $f2, $f2 -/* AF3174 802404D4 46041082 */ mul.s $f2, $f2, $f4 -/* AF3178 802404D8 00000000 */ nop -/* AF317C 802404DC 4600E700 */ add.s $f28, $f28, $f0 -/* AF3180 802404E0 4602D680 */ add.s $f26, $f26, $f2 -/* AF3184 802404E4 0C00A8D4 */ jal cos_deg -/* AF3188 802404E8 4600B306 */ mov.s $f12, $f22 -/* AF318C 802404EC 46140002 */ mul.s $f0, $f0, $f20 -/* AF3190 802404F0 00000000 */ nop -/* AF3194 802404F4 0220202D */ daddu $a0, $s1, $zero -/* AF3198 802404F8 0260282D */ daddu $a1, $s3, $zero -/* AF319C 802404FC 4600E18D */ trunc.w.s $f6, $f28 -/* AF31A0 80240500 44063000 */ mfc1 $a2, $f6 -/* AF31A4 80240504 0C0B2026 */ jal set_variable -/* AF31A8 80240508 4600C601 */ sub.s $f24, $f24, $f0 -/* AF31AC 8024050C 0220202D */ daddu $a0, $s1, $zero -/* AF31B0 80240510 4600D18D */ trunc.w.s $f6, $f26 -/* AF31B4 80240514 44063000 */ mfc1 $a2, $f6 -/* AF31B8 80240518 0C0B2026 */ jal set_variable -/* AF31BC 8024051C 0280282D */ daddu $a1, $s4, $zero -/* AF31C0 80240520 0220202D */ daddu $a0, $s1, $zero -/* AF31C4 80240524 4600C18D */ trunc.w.s $f6, $f24 -/* AF31C8 80240528 44063000 */ mfc1 $a2, $f6 -/* AF31CC 8024052C 0C0B2026 */ jal set_variable -/* AF31D0 80240530 0200282D */ daddu $a1, $s0, $zero -/* AF31D4 80240534 8FBF0024 */ lw $ra, 0x24($sp) -/* AF31D8 80240538 8FB40020 */ lw $s4, 0x20($sp) -/* AF31DC 8024053C 8FB3001C */ lw $s3, 0x1c($sp) -/* AF31E0 80240540 8FB20018 */ lw $s2, 0x18($sp) -/* AF31E4 80240544 8FB10014 */ lw $s1, 0x14($sp) -/* AF31E8 80240548 8FB00010 */ lw $s0, 0x10($sp) -/* AF31EC 8024054C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* AF31F0 80240550 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* AF31F4 80240554 D7B80038 */ ldc1 $f24, 0x38($sp) -/* AF31F8 80240558 D7B60030 */ ldc1 $f22, 0x30($sp) -/* AF31FC 8024055C D7B40028 */ ldc1 $f20, 0x28($sp) -/* AF3200 80240560 24020002 */ addiu $v0, $zero, 2 -/* AF3204 80240564 03E00008 */ jr $ra -/* AF3208 80240568 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_8024030C_AF7C5C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_8024030C_AF7C5C.s deleted file mode 100644 index 80d074bcb7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_8024030C_AF7C5C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_AF7C5C -/* AF7C5C 8024030C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AF7C60 80240310 AFB10014 */ sw $s1, 0x14($sp) -/* AF7C64 80240314 0080882D */ daddu $s1, $a0, $zero -/* AF7C68 80240318 AFBF0024 */ sw $ra, 0x24($sp) -/* AF7C6C 8024031C AFB40020 */ sw $s4, 0x20($sp) -/* AF7C70 80240320 AFB3001C */ sw $s3, 0x1c($sp) -/* AF7C74 80240324 AFB20018 */ sw $s2, 0x18($sp) -/* AF7C78 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* AF7C7C 8024032C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* AF7C80 80240330 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* AF7C84 80240334 F7B80038 */ sdc1 $f24, 0x38($sp) -/* AF7C88 80240338 F7B60030 */ sdc1 $f22, 0x30($sp) -/* AF7C8C 8024033C F7B40028 */ sdc1 $f20, 0x28($sp) -/* AF7C90 80240340 8E30000C */ lw $s0, 0xc($s1) -/* AF7C94 80240344 8E130000 */ lw $s3, ($s0) -/* AF7C98 80240348 26100004 */ addiu $s0, $s0, 4 -/* AF7C9C 8024034C 0C0B1EAF */ jal get_variable -/* AF7CA0 80240350 0260282D */ daddu $a1, $s3, $zero -/* AF7CA4 80240354 4482E000 */ mtc1 $v0, $f28 -/* AF7CA8 80240358 00000000 */ nop -/* AF7CAC 8024035C 4680E720 */ cvt.s.w $f28, $f28 -/* AF7CB0 80240360 8E140000 */ lw $s4, ($s0) -/* AF7CB4 80240364 26100004 */ addiu $s0, $s0, 4 -/* AF7CB8 80240368 0220202D */ daddu $a0, $s1, $zero -/* AF7CBC 8024036C 0C0B1EAF */ jal get_variable -/* AF7CC0 80240370 0280282D */ daddu $a1, $s4, $zero -/* AF7CC4 80240374 4482D000 */ mtc1 $v0, $f26 -/* AF7CC8 80240378 00000000 */ nop -/* AF7CCC 8024037C 4680D6A0 */ cvt.s.w $f26, $f26 -/* AF7CD0 80240380 8E100000 */ lw $s0, ($s0) -/* AF7CD4 80240384 0220202D */ daddu $a0, $s1, $zero -/* AF7CD8 80240388 0C0B1EAF */ jal get_variable -/* AF7CDC 8024038C 0200282D */ daddu $a1, $s0, $zero -/* AF7CE0 80240390 4482C000 */ mtc1 $v0, $f24 -/* AF7CE4 80240394 00000000 */ nop -/* AF7CE8 80240398 4680C620 */ cvt.s.w $f24, $f24 -/* AF7CEC 8024039C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AF7CF0 802403A0 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AF7CF4 802403A4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* AF7CF8 802403A8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* AF7CFC 802403AC C64200A8 */ lwc1 $f2, 0xa8($s2) -/* AF7D00 802403B0 44800000 */ mtc1 $zero, $f0 -/* AF7D04 802403B4 00031080 */ sll $v0, $v1, 2 -/* AF7D08 802403B8 00431021 */ addu $v0, $v0, $v1 -/* AF7D0C 802403BC 00021080 */ sll $v0, $v0, 2 -/* AF7D10 802403C0 00431023 */ subu $v0, $v0, $v1 -/* AF7D14 802403C4 000218C0 */ sll $v1, $v0, 3 -/* AF7D18 802403C8 00431021 */ addu $v0, $v0, $v1 -/* AF7D1C 802403CC 000210C0 */ sll $v0, $v0, 3 -/* AF7D20 802403D0 46001032 */ c.eq.s $f2, $f0 -/* AF7D24 802403D4 3C01800B */ lui $at, 0x800b -/* AF7D28 802403D8 00220821 */ addu $at, $at, $v0 -/* AF7D2C 802403DC C4361DEC */ lwc1 $f22, 0x1dec($at) -/* AF7D30 802403E0 45000005 */ bc1f .L802403F8 -/* AF7D34 802403E4 00000000 */ nop -/* AF7D38 802403E8 3C0142C8 */ lui $at, 0x42c8 -/* AF7D3C 802403EC 44810000 */ mtc1 $at, $f0 -/* AF7D40 802403F0 08090102 */ j .L80240408 -/* AF7D44 802403F4 4600B581 */ sub.s $f22, $f22, $f0 -.L802403F8: -/* AF7D48 802403F8 3C0142C8 */ lui $at, 0x42c8 -/* AF7D4C 802403FC 44810000 */ mtc1 $at, $f0 -/* AF7D50 80240400 00000000 */ nop -/* AF7D54 80240404 4600B580 */ add.s $f22, $f22, $f0 -.L80240408: -/* AF7D58 80240408 0C00A6C9 */ jal clamp_angle -/* AF7D5C 8024040C 4600B306 */ mov.s $f12, $f22 -/* AF7D60 80240410 46000586 */ mov.s $f22, $f0 -/* AF7D64 80240414 3C014170 */ lui $at, 0x4170 -/* AF7D68 80240418 4481A000 */ mtc1 $at, $f20 -/* AF7D6C 8024041C 0C00A8BB */ jal sin_deg -/* AF7D70 80240420 4600B306 */ mov.s $f12, $f22 -/* AF7D74 80240424 46140002 */ mul.s $f0, $f0, $f20 -/* AF7D78 80240428 00000000 */ nop -/* AF7D7C 8024042C 864200B0 */ lh $v0, 0xb0($s2) -/* AF7D80 80240430 3C013F00 */ lui $at, 0x3f00 -/* AF7D84 80240434 44812000 */ mtc1 $at, $f4 -/* AF7D88 80240438 44821000 */ mtc1 $v0, $f2 -/* AF7D8C 8024043C 00000000 */ nop -/* AF7D90 80240440 468010A0 */ cvt.s.w $f2, $f2 -/* AF7D94 80240444 46041082 */ mul.s $f2, $f2, $f4 -/* AF7D98 80240448 00000000 */ nop -/* AF7D9C 8024044C 4600E700 */ add.s $f28, $f28, $f0 -/* AF7DA0 80240450 4602D680 */ add.s $f26, $f26, $f2 -/* AF7DA4 80240454 0C00A8D4 */ jal cos_deg -/* AF7DA8 80240458 4600B306 */ mov.s $f12, $f22 -/* AF7DAC 8024045C 46140002 */ mul.s $f0, $f0, $f20 -/* AF7DB0 80240460 00000000 */ nop -/* AF7DB4 80240464 0220202D */ daddu $a0, $s1, $zero -/* AF7DB8 80240468 0260282D */ daddu $a1, $s3, $zero -/* AF7DBC 8024046C 4600E18D */ trunc.w.s $f6, $f28 -/* AF7DC0 80240470 44063000 */ mfc1 $a2, $f6 -/* AF7DC4 80240474 0C0B2026 */ jal set_variable -/* AF7DC8 80240478 4600C601 */ sub.s $f24, $f24, $f0 -/* AF7DCC 8024047C 0220202D */ daddu $a0, $s1, $zero -/* AF7DD0 80240480 4600D18D */ trunc.w.s $f6, $f26 -/* AF7DD4 80240484 44063000 */ mfc1 $a2, $f6 -/* AF7DD8 80240488 0C0B2026 */ jal set_variable -/* AF7DDC 8024048C 0280282D */ daddu $a1, $s4, $zero -/* AF7DE0 80240490 0220202D */ daddu $a0, $s1, $zero -/* AF7DE4 80240494 4600C18D */ trunc.w.s $f6, $f24 -/* AF7DE8 80240498 44063000 */ mfc1 $a2, $f6 -/* AF7DEC 8024049C 0C0B2026 */ jal set_variable -/* AF7DF0 802404A0 0200282D */ daddu $a1, $s0, $zero -/* AF7DF4 802404A4 8FBF0024 */ lw $ra, 0x24($sp) -/* AF7DF8 802404A8 8FB40020 */ lw $s4, 0x20($sp) -/* AF7DFC 802404AC 8FB3001C */ lw $s3, 0x1c($sp) -/* AF7E00 802404B0 8FB20018 */ lw $s2, 0x18($sp) -/* AF7E04 802404B4 8FB10014 */ lw $s1, 0x14($sp) -/* AF7E08 802404B8 8FB00010 */ lw $s0, 0x10($sp) -/* AF7E0C 802404BC D7BC0048 */ ldc1 $f28, 0x48($sp) -/* AF7E10 802404C0 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* AF7E14 802404C4 D7B80038 */ ldc1 $f24, 0x38($sp) -/* AF7E18 802404C8 D7B60030 */ ldc1 $f22, 0x30($sp) -/* AF7E1C 802404CC D7B40028 */ ldc1 $f20, 0x28($sp) -/* AF7E20 802404D0 24020002 */ addiu $v0, $zero, 2 -/* AF7E24 802404D4 03E00008 */ jr $ra -/* AF7E28 802404D8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024209C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024209C.s deleted file mode 100644 index d237485be0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024209C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024209C -/* 8B210C 8024209C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8B2110 802420A0 AFB10014 */ sw $s1, 0x14($sp) -/* 8B2114 802420A4 0080882D */ daddu $s1, $a0, $zero -/* 8B2118 802420A8 AFBF0024 */ sw $ra, 0x24($sp) -/* 8B211C 802420AC AFB40020 */ sw $s4, 0x20($sp) -/* 8B2120 802420B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8B2124 802420B4 AFB20018 */ sw $s2, 0x18($sp) -/* 8B2128 802420B8 AFB00010 */ sw $s0, 0x10($sp) -/* 8B212C 802420BC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 8B2130 802420C0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8B2134 802420C4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8B2138 802420C8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8B213C 802420CC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8B2140 802420D0 8E30000C */ lw $s0, 0xc($s1) -/* 8B2144 802420D4 8E130000 */ lw $s3, ($s0) -/* 8B2148 802420D8 26100004 */ addiu $s0, $s0, 4 -/* 8B214C 802420DC 0C0B1EAF */ jal get_variable -/* 8B2150 802420E0 0260282D */ daddu $a1, $s3, $zero -/* 8B2154 802420E4 4482E000 */ mtc1 $v0, $f28 -/* 8B2158 802420E8 00000000 */ nop -/* 8B215C 802420EC 4680E720 */ cvt.s.w $f28, $f28 -/* 8B2160 802420F0 8E140000 */ lw $s4, ($s0) -/* 8B2164 802420F4 26100004 */ addiu $s0, $s0, 4 -/* 8B2168 802420F8 0220202D */ daddu $a0, $s1, $zero -/* 8B216C 802420FC 0C0B1EAF */ jal get_variable -/* 8B2170 80242100 0280282D */ daddu $a1, $s4, $zero -/* 8B2174 80242104 4482D000 */ mtc1 $v0, $f26 -/* 8B2178 80242108 00000000 */ nop -/* 8B217C 8024210C 4680D6A0 */ cvt.s.w $f26, $f26 -/* 8B2180 80242110 8E100000 */ lw $s0, ($s0) -/* 8B2184 80242114 0220202D */ daddu $a0, $s1, $zero -/* 8B2188 80242118 0C0B1EAF */ jal get_variable -/* 8B218C 8024211C 0200282D */ daddu $a1, $s0, $zero -/* 8B2190 80242120 4482C000 */ mtc1 $v0, $f24 -/* 8B2194 80242124 00000000 */ nop -/* 8B2198 80242128 4680C620 */ cvt.s.w $f24, $f24 -/* 8B219C 8024212C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 8B21A0 80242130 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 8B21A4 80242134 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8B21A8 80242138 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8B21AC 8024213C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 8B21B0 80242140 44800000 */ mtc1 $zero, $f0 -/* 8B21B4 80242144 00031080 */ sll $v0, $v1, 2 -/* 8B21B8 80242148 00431021 */ addu $v0, $v0, $v1 -/* 8B21BC 8024214C 00021080 */ sll $v0, $v0, 2 -/* 8B21C0 80242150 00431023 */ subu $v0, $v0, $v1 -/* 8B21C4 80242154 000218C0 */ sll $v1, $v0, 3 -/* 8B21C8 80242158 00431021 */ addu $v0, $v0, $v1 -/* 8B21CC 8024215C 000210C0 */ sll $v0, $v0, 3 -/* 8B21D0 80242160 46001032 */ c.eq.s $f2, $f0 -/* 8B21D4 80242164 3C01800B */ lui $at, 0x800b -/* 8B21D8 80242168 00220821 */ addu $at, $at, $v0 -/* 8B21DC 8024216C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 8B21E0 80242170 45000005 */ bc1f .L80242188 -/* 8B21E4 80242174 00000000 */ nop -/* 8B21E8 80242178 3C0142C8 */ lui $at, 0x42c8 -/* 8B21EC 8024217C 44810000 */ mtc1 $at, $f0 -/* 8B21F0 80242180 08090866 */ j .L80242198 -/* 8B21F4 80242184 4600B581 */ sub.s $f22, $f22, $f0 -.L80242188: -/* 8B21F8 80242188 3C0142C8 */ lui $at, 0x42c8 -/* 8B21FC 8024218C 44810000 */ mtc1 $at, $f0 -/* 8B2200 80242190 00000000 */ nop -/* 8B2204 80242194 4600B580 */ add.s $f22, $f22, $f0 -.L80242198: -/* 8B2208 80242198 0C00A6C9 */ jal clamp_angle -/* 8B220C 8024219C 4600B306 */ mov.s $f12, $f22 -/* 8B2210 802421A0 46000586 */ mov.s $f22, $f0 -/* 8B2214 802421A4 3C014170 */ lui $at, 0x4170 -/* 8B2218 802421A8 4481A000 */ mtc1 $at, $f20 -/* 8B221C 802421AC 0C00A8BB */ jal sin_deg -/* 8B2220 802421B0 4600B306 */ mov.s $f12, $f22 -/* 8B2224 802421B4 46140002 */ mul.s $f0, $f0, $f20 -/* 8B2228 802421B8 00000000 */ nop -/* 8B222C 802421BC 864200B0 */ lh $v0, 0xb0($s2) -/* 8B2230 802421C0 3C013F00 */ lui $at, 0x3f00 -/* 8B2234 802421C4 44812000 */ mtc1 $at, $f4 -/* 8B2238 802421C8 44821000 */ mtc1 $v0, $f2 -/* 8B223C 802421CC 00000000 */ nop -/* 8B2240 802421D0 468010A0 */ cvt.s.w $f2, $f2 -/* 8B2244 802421D4 46041082 */ mul.s $f2, $f2, $f4 -/* 8B2248 802421D8 00000000 */ nop -/* 8B224C 802421DC 4600E700 */ add.s $f28, $f28, $f0 -/* 8B2250 802421E0 4602D680 */ add.s $f26, $f26, $f2 -/* 8B2254 802421E4 0C00A8D4 */ jal cos_deg -/* 8B2258 802421E8 4600B306 */ mov.s $f12, $f22 -/* 8B225C 802421EC 46140002 */ mul.s $f0, $f0, $f20 -/* 8B2260 802421F0 00000000 */ nop -/* 8B2264 802421F4 0220202D */ daddu $a0, $s1, $zero -/* 8B2268 802421F8 0260282D */ daddu $a1, $s3, $zero -/* 8B226C 802421FC 4600E18D */ trunc.w.s $f6, $f28 -/* 8B2270 80242200 44063000 */ mfc1 $a2, $f6 -/* 8B2274 80242204 0C0B2026 */ jal set_variable -/* 8B2278 80242208 4600C601 */ sub.s $f24, $f24, $f0 -/* 8B227C 8024220C 0220202D */ daddu $a0, $s1, $zero -/* 8B2280 80242210 4600D18D */ trunc.w.s $f6, $f26 -/* 8B2284 80242214 44063000 */ mfc1 $a2, $f6 -/* 8B2288 80242218 0C0B2026 */ jal set_variable -/* 8B228C 8024221C 0280282D */ daddu $a1, $s4, $zero -/* 8B2290 80242220 0220202D */ daddu $a0, $s1, $zero -/* 8B2294 80242224 4600C18D */ trunc.w.s $f6, $f24 -/* 8B2298 80242228 44063000 */ mfc1 $a2, $f6 -/* 8B229C 8024222C 0C0B2026 */ jal set_variable -/* 8B22A0 80242230 0200282D */ daddu $a1, $s0, $zero -/* 8B22A4 80242234 8FBF0024 */ lw $ra, 0x24($sp) -/* 8B22A8 80242238 8FB40020 */ lw $s4, 0x20($sp) -/* 8B22AC 8024223C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B22B0 80242240 8FB20018 */ lw $s2, 0x18($sp) -/* 8B22B4 80242244 8FB10014 */ lw $s1, 0x14($sp) -/* 8B22B8 80242248 8FB00010 */ lw $s0, 0x10($sp) -/* 8B22BC 8024224C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 8B22C0 80242250 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8B22C4 80242254 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8B22C8 80242258 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8B22CC 8024225C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8B22D0 80242260 24020002 */ addiu $v0, $zero, 2 -/* 8B22D4 80242264 03E00008 */ jr $ra -/* 8B22D8 80242268 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270.s index 5fd0cf2b12..f14bb3f54d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270.s @@ -93,7 +93,7 @@ glabel func_80243270 /* A96B08 802433C8 00000000 */ nop /* A96B0C 802433CC 0280202D */ daddu $a0, $s4, $zero /* A96B10 802433D0 0200282D */ daddu $a1, $s0, $zero -/* A96B14 802433D4 0C090904 */ jal func_80242410 +/* A96B14 802433D4 0C090904 */ jal func_80242410_A95B50 /* A96B18 802433D8 0260302D */ daddu $a2, $s3, $zero /* A96B1C 802433DC 0280202D */ daddu $a0, $s4, $zero /* A96B20 802433E0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802400AC.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802400AC.s deleted file mode 100644 index 92e7acb5c4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802400AC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400AC -/* A7856C 802400AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A78570 802400B0 AFB10014 */ sw $s1, 0x14($sp) -/* A78574 802400B4 0080882D */ daddu $s1, $a0, $zero -/* A78578 802400B8 AFBF0024 */ sw $ra, 0x24($sp) -/* A7857C 802400BC AFB40020 */ sw $s4, 0x20($sp) -/* A78580 802400C0 AFB3001C */ sw $s3, 0x1c($sp) -/* A78584 802400C4 AFB20018 */ sw $s2, 0x18($sp) -/* A78588 802400C8 AFB00010 */ sw $s0, 0x10($sp) -/* A7858C 802400CC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* A78590 802400D0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* A78594 802400D4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* A78598 802400D8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A7859C 802400DC F7B40028 */ sdc1 $f20, 0x28($sp) -/* A785A0 802400E0 8E30000C */ lw $s0, 0xc($s1) -/* A785A4 802400E4 8E130000 */ lw $s3, ($s0) -/* A785A8 802400E8 26100004 */ addiu $s0, $s0, 4 -/* A785AC 802400EC 0C0B1EAF */ jal get_variable -/* A785B0 802400F0 0260282D */ daddu $a1, $s3, $zero -/* A785B4 802400F4 4482E000 */ mtc1 $v0, $f28 -/* A785B8 802400F8 00000000 */ nop -/* A785BC 802400FC 4680E720 */ cvt.s.w $f28, $f28 -/* A785C0 80240100 8E140000 */ lw $s4, ($s0) -/* A785C4 80240104 26100004 */ addiu $s0, $s0, 4 -/* A785C8 80240108 0220202D */ daddu $a0, $s1, $zero -/* A785CC 8024010C 0C0B1EAF */ jal get_variable -/* A785D0 80240110 0280282D */ daddu $a1, $s4, $zero -/* A785D4 80240114 4482D000 */ mtc1 $v0, $f26 -/* A785D8 80240118 00000000 */ nop -/* A785DC 8024011C 4680D6A0 */ cvt.s.w $f26, $f26 -/* A785E0 80240120 8E100000 */ lw $s0, ($s0) -/* A785E4 80240124 0220202D */ daddu $a0, $s1, $zero -/* A785E8 80240128 0C0B1EAF */ jal get_variable -/* A785EC 8024012C 0200282D */ daddu $a1, $s0, $zero -/* A785F0 80240130 4482C000 */ mtc1 $v0, $f24 -/* A785F4 80240134 00000000 */ nop -/* A785F8 80240138 4680C620 */ cvt.s.w $f24, $f24 -/* A785FC 8024013C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* A78600 80240140 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* A78604 80240144 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A78608 80240148 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A7860C 8024014C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* A78610 80240150 44800000 */ mtc1 $zero, $f0 -/* A78614 80240154 00031080 */ sll $v0, $v1, 2 -/* A78618 80240158 00431021 */ addu $v0, $v0, $v1 -/* A7861C 8024015C 00021080 */ sll $v0, $v0, 2 -/* A78620 80240160 00431023 */ subu $v0, $v0, $v1 -/* A78624 80240164 000218C0 */ sll $v1, $v0, 3 -/* A78628 80240168 00431021 */ addu $v0, $v0, $v1 -/* A7862C 8024016C 000210C0 */ sll $v0, $v0, 3 -/* A78630 80240170 46001032 */ c.eq.s $f2, $f0 -/* A78634 80240174 3C01800B */ lui $at, 0x800b -/* A78638 80240178 00220821 */ addu $at, $at, $v0 -/* A7863C 8024017C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* A78640 80240180 45000005 */ bc1f .L80240198 -/* A78644 80240184 00000000 */ nop -/* A78648 80240188 3C0142C8 */ lui $at, 0x42c8 -/* A7864C 8024018C 44810000 */ mtc1 $at, $f0 -/* A78650 80240190 0809006A */ j .L802401A8 -/* A78654 80240194 4600B581 */ sub.s $f22, $f22, $f0 -.L80240198: -/* A78658 80240198 3C0142C8 */ lui $at, 0x42c8 -/* A7865C 8024019C 44810000 */ mtc1 $at, $f0 -/* A78660 802401A0 00000000 */ nop -/* A78664 802401A4 4600B580 */ add.s $f22, $f22, $f0 -.L802401A8: -/* A78668 802401A8 0C00A6C9 */ jal clamp_angle -/* A7866C 802401AC 4600B306 */ mov.s $f12, $f22 -/* A78670 802401B0 46000586 */ mov.s $f22, $f0 -/* A78674 802401B4 3C014170 */ lui $at, 0x4170 -/* A78678 802401B8 4481A000 */ mtc1 $at, $f20 -/* A7867C 802401BC 0C00A8BB */ jal sin_deg -/* A78680 802401C0 4600B306 */ mov.s $f12, $f22 -/* A78684 802401C4 46140002 */ mul.s $f0, $f0, $f20 -/* A78688 802401C8 00000000 */ nop -/* A7868C 802401CC 864200B0 */ lh $v0, 0xb0($s2) -/* A78690 802401D0 3C013F00 */ lui $at, 0x3f00 -/* A78694 802401D4 44812000 */ mtc1 $at, $f4 -/* A78698 802401D8 44821000 */ mtc1 $v0, $f2 -/* A7869C 802401DC 00000000 */ nop -/* A786A0 802401E0 468010A0 */ cvt.s.w $f2, $f2 -/* A786A4 802401E4 46041082 */ mul.s $f2, $f2, $f4 -/* A786A8 802401E8 00000000 */ nop -/* A786AC 802401EC 4600E700 */ add.s $f28, $f28, $f0 -/* A786B0 802401F0 4602D680 */ add.s $f26, $f26, $f2 -/* A786B4 802401F4 0C00A8D4 */ jal cos_deg -/* A786B8 802401F8 4600B306 */ mov.s $f12, $f22 -/* A786BC 802401FC 46140002 */ mul.s $f0, $f0, $f20 -/* A786C0 80240200 00000000 */ nop -/* A786C4 80240204 0220202D */ daddu $a0, $s1, $zero -/* A786C8 80240208 0260282D */ daddu $a1, $s3, $zero -/* A786CC 8024020C 4600E18D */ trunc.w.s $f6, $f28 -/* A786D0 80240210 44063000 */ mfc1 $a2, $f6 -/* A786D4 80240214 0C0B2026 */ jal set_variable -/* A786D8 80240218 4600C601 */ sub.s $f24, $f24, $f0 -/* A786DC 8024021C 0220202D */ daddu $a0, $s1, $zero -/* A786E0 80240220 4600D18D */ trunc.w.s $f6, $f26 -/* A786E4 80240224 44063000 */ mfc1 $a2, $f6 -/* A786E8 80240228 0C0B2026 */ jal set_variable -/* A786EC 8024022C 0280282D */ daddu $a1, $s4, $zero -/* A786F0 80240230 0220202D */ daddu $a0, $s1, $zero -/* A786F4 80240234 4600C18D */ trunc.w.s $f6, $f24 -/* A786F8 80240238 44063000 */ mfc1 $a2, $f6 -/* A786FC 8024023C 0C0B2026 */ jal set_variable -/* A78700 80240240 0200282D */ daddu $a1, $s0, $zero -/* A78704 80240244 8FBF0024 */ lw $ra, 0x24($sp) -/* A78708 80240248 8FB40020 */ lw $s4, 0x20($sp) -/* A7870C 8024024C 8FB3001C */ lw $s3, 0x1c($sp) -/* A78710 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* A78714 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* A78718 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* A7871C 8024025C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* A78720 80240260 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* A78724 80240264 D7B80038 */ ldc1 $f24, 0x38($sp) -/* A78728 80240268 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A7872C 8024026C D7B40028 */ ldc1 $f20, 0x28($sp) -/* A78730 80240270 24020002 */ addiu $v0, $zero, 2 -/* A78734 80240274 03E00008 */ jr $ra -/* A78738 80240278 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802400AC_A7A5AC.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802400AC_A7A5AC.s deleted file mode 100644 index 7b53c9861b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802400AC_A7A5AC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400AC_A7A5AC -/* A7A5AC 802400AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A7A5B0 802400B0 AFB10014 */ sw $s1, 0x14($sp) -/* A7A5B4 802400B4 0080882D */ daddu $s1, $a0, $zero -/* A7A5B8 802400B8 AFBF0024 */ sw $ra, 0x24($sp) -/* A7A5BC 802400BC AFB40020 */ sw $s4, 0x20($sp) -/* A7A5C0 802400C0 AFB3001C */ sw $s3, 0x1c($sp) -/* A7A5C4 802400C4 AFB20018 */ sw $s2, 0x18($sp) -/* A7A5C8 802400C8 AFB00010 */ sw $s0, 0x10($sp) -/* A7A5CC 802400CC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* A7A5D0 802400D0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* A7A5D4 802400D4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* A7A5D8 802400D8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A7A5DC 802400DC F7B40028 */ sdc1 $f20, 0x28($sp) -/* A7A5E0 802400E0 8E30000C */ lw $s0, 0xc($s1) -/* A7A5E4 802400E4 8E130000 */ lw $s3, ($s0) -/* A7A5E8 802400E8 26100004 */ addiu $s0, $s0, 4 -/* A7A5EC 802400EC 0C0B1EAF */ jal get_variable -/* A7A5F0 802400F0 0260282D */ daddu $a1, $s3, $zero -/* A7A5F4 802400F4 4482E000 */ mtc1 $v0, $f28 -/* A7A5F8 802400F8 00000000 */ nop -/* A7A5FC 802400FC 4680E720 */ cvt.s.w $f28, $f28 -/* A7A600 80240100 8E140000 */ lw $s4, ($s0) -/* A7A604 80240104 26100004 */ addiu $s0, $s0, 4 -/* A7A608 80240108 0220202D */ daddu $a0, $s1, $zero -/* A7A60C 8024010C 0C0B1EAF */ jal get_variable -/* A7A610 80240110 0280282D */ daddu $a1, $s4, $zero -/* A7A614 80240114 4482D000 */ mtc1 $v0, $f26 -/* A7A618 80240118 00000000 */ nop -/* A7A61C 8024011C 4680D6A0 */ cvt.s.w $f26, $f26 -/* A7A620 80240120 8E100000 */ lw $s0, ($s0) -/* A7A624 80240124 0220202D */ daddu $a0, $s1, $zero -/* A7A628 80240128 0C0B1EAF */ jal get_variable -/* A7A62C 8024012C 0200282D */ daddu $a1, $s0, $zero -/* A7A630 80240130 4482C000 */ mtc1 $v0, $f24 -/* A7A634 80240134 00000000 */ nop -/* A7A638 80240138 4680C620 */ cvt.s.w $f24, $f24 -/* A7A63C 8024013C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* A7A640 80240140 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* A7A644 80240144 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A7A648 80240148 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A7A64C 8024014C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* A7A650 80240150 44800000 */ mtc1 $zero, $f0 -/* A7A654 80240154 00031080 */ sll $v0, $v1, 2 -/* A7A658 80240158 00431021 */ addu $v0, $v0, $v1 -/* A7A65C 8024015C 00021080 */ sll $v0, $v0, 2 -/* A7A660 80240160 00431023 */ subu $v0, $v0, $v1 -/* A7A664 80240164 000218C0 */ sll $v1, $v0, 3 -/* A7A668 80240168 00431021 */ addu $v0, $v0, $v1 -/* A7A66C 8024016C 000210C0 */ sll $v0, $v0, 3 -/* A7A670 80240170 46001032 */ c.eq.s $f2, $f0 -/* A7A674 80240174 3C01800B */ lui $at, 0x800b -/* A7A678 80240178 00220821 */ addu $at, $at, $v0 -/* A7A67C 8024017C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* A7A680 80240180 45000005 */ bc1f .L80240198 -/* A7A684 80240184 00000000 */ nop -/* A7A688 80240188 3C0142C8 */ lui $at, 0x42c8 -/* A7A68C 8024018C 44810000 */ mtc1 $at, $f0 -/* A7A690 80240190 0809006A */ j .L802401A8 -/* A7A694 80240194 4600B581 */ sub.s $f22, $f22, $f0 -.L80240198: -/* A7A698 80240198 3C0142C8 */ lui $at, 0x42c8 -/* A7A69C 8024019C 44810000 */ mtc1 $at, $f0 -/* A7A6A0 802401A0 00000000 */ nop -/* A7A6A4 802401A4 4600B580 */ add.s $f22, $f22, $f0 -.L802401A8: -/* A7A6A8 802401A8 0C00A6C9 */ jal clamp_angle -/* A7A6AC 802401AC 4600B306 */ mov.s $f12, $f22 -/* A7A6B0 802401B0 46000586 */ mov.s $f22, $f0 -/* A7A6B4 802401B4 3C014170 */ lui $at, 0x4170 -/* A7A6B8 802401B8 4481A000 */ mtc1 $at, $f20 -/* A7A6BC 802401BC 0C00A8BB */ jal sin_deg -/* A7A6C0 802401C0 4600B306 */ mov.s $f12, $f22 -/* A7A6C4 802401C4 46140002 */ mul.s $f0, $f0, $f20 -/* A7A6C8 802401C8 00000000 */ nop -/* A7A6CC 802401CC 864200B0 */ lh $v0, 0xb0($s2) -/* A7A6D0 802401D0 3C013F00 */ lui $at, 0x3f00 -/* A7A6D4 802401D4 44812000 */ mtc1 $at, $f4 -/* A7A6D8 802401D8 44821000 */ mtc1 $v0, $f2 -/* A7A6DC 802401DC 00000000 */ nop -/* A7A6E0 802401E0 468010A0 */ cvt.s.w $f2, $f2 -/* A7A6E4 802401E4 46041082 */ mul.s $f2, $f2, $f4 -/* A7A6E8 802401E8 00000000 */ nop -/* A7A6EC 802401EC 4600E700 */ add.s $f28, $f28, $f0 -/* A7A6F0 802401F0 4602D680 */ add.s $f26, $f26, $f2 -/* A7A6F4 802401F4 0C00A8D4 */ jal cos_deg -/* A7A6F8 802401F8 4600B306 */ mov.s $f12, $f22 -/* A7A6FC 802401FC 46140002 */ mul.s $f0, $f0, $f20 -/* A7A700 80240200 00000000 */ nop -/* A7A704 80240204 0220202D */ daddu $a0, $s1, $zero -/* A7A708 80240208 0260282D */ daddu $a1, $s3, $zero -/* A7A70C 8024020C 4600E18D */ trunc.w.s $f6, $f28 -/* A7A710 80240210 44063000 */ mfc1 $a2, $f6 -/* A7A714 80240214 0C0B2026 */ jal set_variable -/* A7A718 80240218 4600C601 */ sub.s $f24, $f24, $f0 -/* A7A71C 8024021C 0220202D */ daddu $a0, $s1, $zero -/* A7A720 80240220 4600D18D */ trunc.w.s $f6, $f26 -/* A7A724 80240224 44063000 */ mfc1 $a2, $f6 -/* A7A728 80240228 0C0B2026 */ jal set_variable -/* A7A72C 8024022C 0280282D */ daddu $a1, $s4, $zero -/* A7A730 80240230 0220202D */ daddu $a0, $s1, $zero -/* A7A734 80240234 4600C18D */ trunc.w.s $f6, $f24 -/* A7A738 80240238 44063000 */ mfc1 $a2, $f6 -/* A7A73C 8024023C 0C0B2026 */ jal set_variable -/* A7A740 80240240 0200282D */ daddu $a1, $s0, $zero -/* A7A744 80240244 8FBF0024 */ lw $ra, 0x24($sp) -/* A7A748 80240248 8FB40020 */ lw $s4, 0x20($sp) -/* A7A74C 8024024C 8FB3001C */ lw $s3, 0x1c($sp) -/* A7A750 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* A7A754 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* A7A758 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* A7A75C 8024025C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* A7A760 80240260 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* A7A764 80240264 D7B80038 */ ldc1 $f24, 0x38($sp) -/* A7A768 80240268 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A7A76C 8024026C D7B40028 */ ldc1 $f20, 0x28($sp) -/* A7A770 80240270 24020002 */ addiu $v0, $zero, 2 -/* A7A774 80240274 03E00008 */ jr $ra -/* A7A778 80240278 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242140.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242140.s deleted file mode 100644 index 54349fc216..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242140.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242140 -/* C5C880 80242140 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C5C884 80242144 AFB10014 */ sw $s1, 0x14($sp) -/* C5C888 80242148 0080882D */ daddu $s1, $a0, $zero -/* C5C88C 8024214C AFBF0024 */ sw $ra, 0x24($sp) -/* C5C890 80242150 AFB40020 */ sw $s4, 0x20($sp) -/* C5C894 80242154 AFB3001C */ sw $s3, 0x1c($sp) -/* C5C898 80242158 AFB20018 */ sw $s2, 0x18($sp) -/* C5C89C 8024215C AFB00010 */ sw $s0, 0x10($sp) -/* C5C8A0 80242160 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C5C8A4 80242164 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C5C8A8 80242168 F7B80038 */ sdc1 $f24, 0x38($sp) -/* C5C8AC 8024216C F7B60030 */ sdc1 $f22, 0x30($sp) -/* C5C8B0 80242170 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C5C8B4 80242174 8E30000C */ lw $s0, 0xc($s1) -/* C5C8B8 80242178 8E130000 */ lw $s3, ($s0) -/* C5C8BC 8024217C 26100004 */ addiu $s0, $s0, 4 -/* C5C8C0 80242180 0C0B1EAF */ jal get_variable -/* C5C8C4 80242184 0260282D */ daddu $a1, $s3, $zero -/* C5C8C8 80242188 4482E000 */ mtc1 $v0, $f28 -/* C5C8CC 8024218C 00000000 */ nop -/* C5C8D0 80242190 4680E720 */ cvt.s.w $f28, $f28 -/* C5C8D4 80242194 8E140000 */ lw $s4, ($s0) -/* C5C8D8 80242198 26100004 */ addiu $s0, $s0, 4 -/* C5C8DC 8024219C 0220202D */ daddu $a0, $s1, $zero -/* C5C8E0 802421A0 0C0B1EAF */ jal get_variable -/* C5C8E4 802421A4 0280282D */ daddu $a1, $s4, $zero -/* C5C8E8 802421A8 4482D000 */ mtc1 $v0, $f26 -/* C5C8EC 802421AC 00000000 */ nop -/* C5C8F0 802421B0 4680D6A0 */ cvt.s.w $f26, $f26 -/* C5C8F4 802421B4 8E100000 */ lw $s0, ($s0) -/* C5C8F8 802421B8 0220202D */ daddu $a0, $s1, $zero -/* C5C8FC 802421BC 0C0B1EAF */ jal get_variable -/* C5C900 802421C0 0200282D */ daddu $a1, $s0, $zero -/* C5C904 802421C4 4482C000 */ mtc1 $v0, $f24 -/* C5C908 802421C8 00000000 */ nop -/* C5C90C 802421CC 4680C620 */ cvt.s.w $f24, $f24 -/* C5C910 802421D0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C5C914 802421D4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C5C918 802421D8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C5C91C 802421DC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C5C920 802421E0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C5C924 802421E4 44800000 */ mtc1 $zero, $f0 -/* C5C928 802421E8 00031080 */ sll $v0, $v1, 2 -/* C5C92C 802421EC 00431021 */ addu $v0, $v0, $v1 -/* C5C930 802421F0 00021080 */ sll $v0, $v0, 2 -/* C5C934 802421F4 00431023 */ subu $v0, $v0, $v1 -/* C5C938 802421F8 000218C0 */ sll $v1, $v0, 3 -/* C5C93C 802421FC 00431021 */ addu $v0, $v0, $v1 -/* C5C940 80242200 000210C0 */ sll $v0, $v0, 3 -/* C5C944 80242204 46001032 */ c.eq.s $f2, $f0 -/* C5C948 80242208 3C01800B */ lui $at, 0x800b -/* C5C94C 8024220C 00220821 */ addu $at, $at, $v0 -/* C5C950 80242210 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C5C954 80242214 45000005 */ bc1f .L8024222C -/* C5C958 80242218 00000000 */ nop -/* C5C95C 8024221C 3C0142C8 */ lui $at, 0x42c8 -/* C5C960 80242220 44810000 */ mtc1 $at, $f0 -/* C5C964 80242224 0809088F */ j .L8024223C -/* C5C968 80242228 4600B581 */ sub.s $f22, $f22, $f0 -.L8024222C: -/* C5C96C 8024222C 3C0142C8 */ lui $at, 0x42c8 -/* C5C970 80242230 44810000 */ mtc1 $at, $f0 -/* C5C974 80242234 00000000 */ nop -/* C5C978 80242238 4600B580 */ add.s $f22, $f22, $f0 -.L8024223C: -/* C5C97C 8024223C 0C00A6C9 */ jal clamp_angle -/* C5C980 80242240 4600B306 */ mov.s $f12, $f22 -/* C5C984 80242244 46000586 */ mov.s $f22, $f0 -/* C5C988 80242248 3C014170 */ lui $at, 0x4170 -/* C5C98C 8024224C 4481A000 */ mtc1 $at, $f20 -/* C5C990 80242250 0C00A8BB */ jal sin_deg -/* C5C994 80242254 4600B306 */ mov.s $f12, $f22 -/* C5C998 80242258 46140002 */ mul.s $f0, $f0, $f20 -/* C5C99C 8024225C 00000000 */ nop -/* C5C9A0 80242260 864200B0 */ lh $v0, 0xb0($s2) -/* C5C9A4 80242264 3C013F00 */ lui $at, 0x3f00 -/* C5C9A8 80242268 44812000 */ mtc1 $at, $f4 -/* C5C9AC 8024226C 44821000 */ mtc1 $v0, $f2 -/* C5C9B0 80242270 00000000 */ nop -/* C5C9B4 80242274 468010A0 */ cvt.s.w $f2, $f2 -/* C5C9B8 80242278 46041082 */ mul.s $f2, $f2, $f4 -/* C5C9BC 8024227C 00000000 */ nop -/* C5C9C0 80242280 4600E700 */ add.s $f28, $f28, $f0 -/* C5C9C4 80242284 4602D680 */ add.s $f26, $f26, $f2 -/* C5C9C8 80242288 0C00A8D4 */ jal cos_deg -/* C5C9CC 8024228C 4600B306 */ mov.s $f12, $f22 -/* C5C9D0 80242290 46140002 */ mul.s $f0, $f0, $f20 -/* C5C9D4 80242294 00000000 */ nop -/* C5C9D8 80242298 0220202D */ daddu $a0, $s1, $zero -/* C5C9DC 8024229C 0260282D */ daddu $a1, $s3, $zero -/* C5C9E0 802422A0 4600E18D */ trunc.w.s $f6, $f28 -/* C5C9E4 802422A4 44063000 */ mfc1 $a2, $f6 -/* C5C9E8 802422A8 0C0B2026 */ jal set_variable -/* C5C9EC 802422AC 4600C601 */ sub.s $f24, $f24, $f0 -/* C5C9F0 802422B0 0220202D */ daddu $a0, $s1, $zero -/* C5C9F4 802422B4 4600D18D */ trunc.w.s $f6, $f26 -/* C5C9F8 802422B8 44063000 */ mfc1 $a2, $f6 -/* C5C9FC 802422BC 0C0B2026 */ jal set_variable -/* C5CA00 802422C0 0280282D */ daddu $a1, $s4, $zero -/* C5CA04 802422C4 0220202D */ daddu $a0, $s1, $zero -/* C5CA08 802422C8 4600C18D */ trunc.w.s $f6, $f24 -/* C5CA0C 802422CC 44063000 */ mfc1 $a2, $f6 -/* C5CA10 802422D0 0C0B2026 */ jal set_variable -/* C5CA14 802422D4 0200282D */ daddu $a1, $s0, $zero -/* C5CA18 802422D8 8FBF0024 */ lw $ra, 0x24($sp) -/* C5CA1C 802422DC 8FB40020 */ lw $s4, 0x20($sp) -/* C5CA20 802422E0 8FB3001C */ lw $s3, 0x1c($sp) -/* C5CA24 802422E4 8FB20018 */ lw $s2, 0x18($sp) -/* C5CA28 802422E8 8FB10014 */ lw $s1, 0x14($sp) -/* C5CA2C 802422EC 8FB00010 */ lw $s0, 0x10($sp) -/* C5CA30 802422F0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C5CA34 802422F4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C5CA38 802422F8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* C5CA3C 802422FC D7B60030 */ ldc1 $f22, 0x30($sp) -/* C5CA40 80242300 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C5CA44 80242304 24020002 */ addiu $v0, $zero, 2 -/* C5CA48 80242308 03E00008 */ jr $ra -/* C5CA4C 8024230C 27BD0050 */ addiu $sp, $sp, 0x50 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 5cd6df61e4..b04bfe50d2 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 @@ -165,7 +165,7 @@ glabel func_80241214_C61F24 /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 /* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 /* C62194 80241484 00000000 */ nop -/* C62198 80241488 0C09036B */ jal func_80240DAC +/* C62198 80241488 0C09036B */ jal func_80240DAC_C61ABC /* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero /* C621A0 80241490 08090528 */ j .L802414A0 /* C621A4 80241494 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242710_C63420.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242710_C63420.s deleted file mode 100644 index 7f552749c5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242710_C63420.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242710_C63420 -/* C63420 80242710 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C63424 80242714 AFB10014 */ sw $s1, 0x14($sp) -/* C63428 80242718 0080882D */ daddu $s1, $a0, $zero -/* C6342C 8024271C AFBF0024 */ sw $ra, 0x24($sp) -/* C63430 80242720 AFB40020 */ sw $s4, 0x20($sp) -/* C63434 80242724 AFB3001C */ sw $s3, 0x1c($sp) -/* C63438 80242728 AFB20018 */ sw $s2, 0x18($sp) -/* C6343C 8024272C AFB00010 */ sw $s0, 0x10($sp) -/* C63440 80242730 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C63444 80242734 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C63448 80242738 F7B80038 */ sdc1 $f24, 0x38($sp) -/* C6344C 8024273C F7B60030 */ sdc1 $f22, 0x30($sp) -/* C63450 80242740 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C63454 80242744 8E30000C */ lw $s0, 0xc($s1) -/* C63458 80242748 8E130000 */ lw $s3, ($s0) -/* C6345C 8024274C 26100004 */ addiu $s0, $s0, 4 -/* C63460 80242750 0C0B1EAF */ jal get_variable -/* C63464 80242754 0260282D */ daddu $a1, $s3, $zero -/* C63468 80242758 4482E000 */ mtc1 $v0, $f28 -/* C6346C 8024275C 00000000 */ nop -/* C63470 80242760 4680E720 */ cvt.s.w $f28, $f28 -/* C63474 80242764 8E140000 */ lw $s4, ($s0) -/* C63478 80242768 26100004 */ addiu $s0, $s0, 4 -/* C6347C 8024276C 0220202D */ daddu $a0, $s1, $zero -/* C63480 80242770 0C0B1EAF */ jal get_variable -/* C63484 80242774 0280282D */ daddu $a1, $s4, $zero -/* C63488 80242778 4482D000 */ mtc1 $v0, $f26 -/* C6348C 8024277C 00000000 */ nop -/* C63490 80242780 4680D6A0 */ cvt.s.w $f26, $f26 -/* C63494 80242784 8E100000 */ lw $s0, ($s0) -/* C63498 80242788 0220202D */ daddu $a0, $s1, $zero -/* C6349C 8024278C 0C0B1EAF */ jal get_variable -/* C634A0 80242790 0200282D */ daddu $a1, $s0, $zero -/* C634A4 80242794 4482C000 */ mtc1 $v0, $f24 -/* C634A8 80242798 00000000 */ nop -/* C634AC 8024279C 4680C620 */ cvt.s.w $f24, $f24 -/* C634B0 802427A0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C634B4 802427A4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C634B8 802427A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C634BC 802427AC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C634C0 802427B0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C634C4 802427B4 44800000 */ mtc1 $zero, $f0 -/* C634C8 802427B8 00031080 */ sll $v0, $v1, 2 -/* C634CC 802427BC 00431021 */ addu $v0, $v0, $v1 -/* C634D0 802427C0 00021080 */ sll $v0, $v0, 2 -/* C634D4 802427C4 00431023 */ subu $v0, $v0, $v1 -/* C634D8 802427C8 000218C0 */ sll $v1, $v0, 3 -/* C634DC 802427CC 00431021 */ addu $v0, $v0, $v1 -/* C634E0 802427D0 000210C0 */ sll $v0, $v0, 3 -/* C634E4 802427D4 46001032 */ c.eq.s $f2, $f0 -/* C634E8 802427D8 3C01800B */ lui $at, 0x800b -/* C634EC 802427DC 00220821 */ addu $at, $at, $v0 -/* C634F0 802427E0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C634F4 802427E4 45000005 */ bc1f .L802427FC -/* C634F8 802427E8 00000000 */ nop -/* C634FC 802427EC 3C0142C8 */ lui $at, 0x42c8 -/* C63500 802427F0 44810000 */ mtc1 $at, $f0 -/* C63504 802427F4 08090A03 */ j .L8024280C -/* C63508 802427F8 4600B581 */ sub.s $f22, $f22, $f0 -.L802427FC: -/* C6350C 802427FC 3C0142C8 */ lui $at, 0x42c8 -/* C63510 80242800 44810000 */ mtc1 $at, $f0 -/* C63514 80242804 00000000 */ nop -/* C63518 80242808 4600B580 */ add.s $f22, $f22, $f0 -.L8024280C: -/* C6351C 8024280C 0C00A6C9 */ jal clamp_angle -/* C63520 80242810 4600B306 */ mov.s $f12, $f22 -/* C63524 80242814 46000586 */ mov.s $f22, $f0 -/* C63528 80242818 3C014170 */ lui $at, 0x4170 -/* C6352C 8024281C 4481A000 */ mtc1 $at, $f20 -/* C63530 80242820 0C00A8BB */ jal sin_deg -/* C63534 80242824 4600B306 */ mov.s $f12, $f22 -/* C63538 80242828 46140002 */ mul.s $f0, $f0, $f20 -/* C6353C 8024282C 00000000 */ nop -/* C63540 80242830 864200B0 */ lh $v0, 0xb0($s2) -/* C63544 80242834 3C013F00 */ lui $at, 0x3f00 -/* C63548 80242838 44812000 */ mtc1 $at, $f4 -/* C6354C 8024283C 44821000 */ mtc1 $v0, $f2 -/* C63550 80242840 00000000 */ nop -/* C63554 80242844 468010A0 */ cvt.s.w $f2, $f2 -/* C63558 80242848 46041082 */ mul.s $f2, $f2, $f4 -/* C6355C 8024284C 00000000 */ nop -/* C63560 80242850 4600E700 */ add.s $f28, $f28, $f0 -/* C63564 80242854 4602D680 */ add.s $f26, $f26, $f2 -/* C63568 80242858 0C00A8D4 */ jal cos_deg -/* C6356C 8024285C 4600B306 */ mov.s $f12, $f22 -/* C63570 80242860 46140002 */ mul.s $f0, $f0, $f20 -/* C63574 80242864 00000000 */ nop -/* C63578 80242868 0220202D */ daddu $a0, $s1, $zero -/* C6357C 8024286C 0260282D */ daddu $a1, $s3, $zero -/* C63580 80242870 4600E18D */ trunc.w.s $f6, $f28 -/* C63584 80242874 44063000 */ mfc1 $a2, $f6 -/* C63588 80242878 0C0B2026 */ jal set_variable -/* C6358C 8024287C 4600C601 */ sub.s $f24, $f24, $f0 -/* C63590 80242880 0220202D */ daddu $a0, $s1, $zero -/* C63594 80242884 4600D18D */ trunc.w.s $f6, $f26 -/* C63598 80242888 44063000 */ mfc1 $a2, $f6 -/* C6359C 8024288C 0C0B2026 */ jal set_variable -/* C635A0 80242890 0280282D */ daddu $a1, $s4, $zero -/* C635A4 80242894 0220202D */ daddu $a0, $s1, $zero -/* C635A8 80242898 4600C18D */ trunc.w.s $f6, $f24 -/* C635AC 8024289C 44063000 */ mfc1 $a2, $f6 -/* C635B0 802428A0 0C0B2026 */ jal set_variable -/* C635B4 802428A4 0200282D */ daddu $a1, $s0, $zero -/* C635B8 802428A8 8FBF0024 */ lw $ra, 0x24($sp) -/* C635BC 802428AC 8FB40020 */ lw $s4, 0x20($sp) -/* C635C0 802428B0 8FB3001C */ lw $s3, 0x1c($sp) -/* C635C4 802428B4 8FB20018 */ lw $s2, 0x18($sp) -/* C635C8 802428B8 8FB10014 */ lw $s1, 0x14($sp) -/* C635CC 802428BC 8FB00010 */ lw $s0, 0x10($sp) -/* C635D0 802428C0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C635D4 802428C4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C635D8 802428C8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* C635DC 802428CC D7B60030 */ ldc1 $f22, 0x30($sp) -/* C635E0 802428D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C635E4 802428D4 24020002 */ addiu $v0, $zero, 2 -/* C635E8 802428D8 03E00008 */ jr $ra -/* C635EC 802428DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243420.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243420.s deleted file mode 100644 index f7d4b80719..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243420.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243420 -/* C7A100 80243420 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C7A104 80243424 AFB10014 */ sw $s1, 0x14($sp) -/* C7A108 80243428 0080882D */ daddu $s1, $a0, $zero -/* C7A10C 8024342C AFBF0024 */ sw $ra, 0x24($sp) -/* C7A110 80243430 AFB40020 */ sw $s4, 0x20($sp) -/* C7A114 80243434 AFB3001C */ sw $s3, 0x1c($sp) -/* C7A118 80243438 AFB20018 */ sw $s2, 0x18($sp) -/* C7A11C 8024343C AFB00010 */ sw $s0, 0x10($sp) -/* C7A120 80243440 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C7A124 80243444 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C7A128 80243448 F7B80038 */ sdc1 $f24, 0x38($sp) -/* C7A12C 8024344C F7B60030 */ sdc1 $f22, 0x30($sp) -/* C7A130 80243450 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C7A134 80243454 8E30000C */ lw $s0, 0xc($s1) -/* C7A138 80243458 8E130000 */ lw $s3, ($s0) -/* C7A13C 8024345C 26100004 */ addiu $s0, $s0, 4 -/* C7A140 80243460 0C0B1EAF */ jal get_variable -/* C7A144 80243464 0260282D */ daddu $a1, $s3, $zero -/* C7A148 80243468 4482E000 */ mtc1 $v0, $f28 -/* C7A14C 8024346C 00000000 */ nop -/* C7A150 80243470 4680E720 */ cvt.s.w $f28, $f28 -/* C7A154 80243474 8E140000 */ lw $s4, ($s0) -/* C7A158 80243478 26100004 */ addiu $s0, $s0, 4 -/* C7A15C 8024347C 0220202D */ daddu $a0, $s1, $zero -/* C7A160 80243480 0C0B1EAF */ jal get_variable -/* C7A164 80243484 0280282D */ daddu $a1, $s4, $zero -/* C7A168 80243488 4482D000 */ mtc1 $v0, $f26 -/* C7A16C 8024348C 00000000 */ nop -/* C7A170 80243490 4680D6A0 */ cvt.s.w $f26, $f26 -/* C7A174 80243494 8E100000 */ lw $s0, ($s0) -/* C7A178 80243498 0220202D */ daddu $a0, $s1, $zero -/* C7A17C 8024349C 0C0B1EAF */ jal get_variable -/* C7A180 802434A0 0200282D */ daddu $a1, $s0, $zero -/* C7A184 802434A4 4482C000 */ mtc1 $v0, $f24 -/* C7A188 802434A8 00000000 */ nop -/* C7A18C 802434AC 4680C620 */ cvt.s.w $f24, $f24 -/* C7A190 802434B0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C7A194 802434B4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C7A198 802434B8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C7A19C 802434BC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C7A1A0 802434C0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C7A1A4 802434C4 44800000 */ mtc1 $zero, $f0 -/* C7A1A8 802434C8 00031080 */ sll $v0, $v1, 2 -/* C7A1AC 802434CC 00431021 */ addu $v0, $v0, $v1 -/* C7A1B0 802434D0 00021080 */ sll $v0, $v0, 2 -/* C7A1B4 802434D4 00431023 */ subu $v0, $v0, $v1 -/* C7A1B8 802434D8 000218C0 */ sll $v1, $v0, 3 -/* C7A1BC 802434DC 00431021 */ addu $v0, $v0, $v1 -/* C7A1C0 802434E0 000210C0 */ sll $v0, $v0, 3 -/* C7A1C4 802434E4 46001032 */ c.eq.s $f2, $f0 -/* C7A1C8 802434E8 3C01800B */ lui $at, 0x800b -/* C7A1CC 802434EC 00220821 */ addu $at, $at, $v0 -/* C7A1D0 802434F0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C7A1D4 802434F4 45000005 */ bc1f .L8024350C -/* C7A1D8 802434F8 00000000 */ nop -/* C7A1DC 802434FC 3C0142C8 */ lui $at, 0x42c8 -/* C7A1E0 80243500 44810000 */ mtc1 $at, $f0 -/* C7A1E4 80243504 08090D47 */ j .L8024351C -/* C7A1E8 80243508 4600B581 */ sub.s $f22, $f22, $f0 -.L8024350C: -/* C7A1EC 8024350C 3C0142C8 */ lui $at, 0x42c8 -/* C7A1F0 80243510 44810000 */ mtc1 $at, $f0 -/* C7A1F4 80243514 00000000 */ nop -/* C7A1F8 80243518 4600B580 */ add.s $f22, $f22, $f0 -.L8024351C: -/* C7A1FC 8024351C 0C00A6C9 */ jal clamp_angle -/* C7A200 80243520 4600B306 */ mov.s $f12, $f22 -/* C7A204 80243524 46000586 */ mov.s $f22, $f0 -/* C7A208 80243528 3C014170 */ lui $at, 0x4170 -/* C7A20C 8024352C 4481A000 */ mtc1 $at, $f20 -/* C7A210 80243530 0C00A8BB */ jal sin_deg -/* C7A214 80243534 4600B306 */ mov.s $f12, $f22 -/* C7A218 80243538 46140002 */ mul.s $f0, $f0, $f20 -/* C7A21C 8024353C 00000000 */ nop -/* C7A220 80243540 864200B0 */ lh $v0, 0xb0($s2) -/* C7A224 80243544 3C013F00 */ lui $at, 0x3f00 -/* C7A228 80243548 44812000 */ mtc1 $at, $f4 -/* C7A22C 8024354C 44821000 */ mtc1 $v0, $f2 -/* C7A230 80243550 00000000 */ nop -/* C7A234 80243554 468010A0 */ cvt.s.w $f2, $f2 -/* C7A238 80243558 46041082 */ mul.s $f2, $f2, $f4 -/* C7A23C 8024355C 00000000 */ nop -/* C7A240 80243560 4600E700 */ add.s $f28, $f28, $f0 -/* C7A244 80243564 4602D680 */ add.s $f26, $f26, $f2 -/* C7A248 80243568 0C00A8D4 */ jal cos_deg -/* C7A24C 8024356C 4600B306 */ mov.s $f12, $f22 -/* C7A250 80243570 46140002 */ mul.s $f0, $f0, $f20 -/* C7A254 80243574 00000000 */ nop -/* C7A258 80243578 0220202D */ daddu $a0, $s1, $zero -/* C7A25C 8024357C 0260282D */ daddu $a1, $s3, $zero -/* C7A260 80243580 4600E18D */ trunc.w.s $f6, $f28 -/* C7A264 80243584 44063000 */ mfc1 $a2, $f6 -/* C7A268 80243588 0C0B2026 */ jal set_variable -/* C7A26C 8024358C 4600C601 */ sub.s $f24, $f24, $f0 -/* C7A270 80243590 0220202D */ daddu $a0, $s1, $zero -/* C7A274 80243594 4600D18D */ trunc.w.s $f6, $f26 -/* C7A278 80243598 44063000 */ mfc1 $a2, $f6 -/* C7A27C 8024359C 0C0B2026 */ jal set_variable -/* C7A280 802435A0 0280282D */ daddu $a1, $s4, $zero -/* C7A284 802435A4 0220202D */ daddu $a0, $s1, $zero -/* C7A288 802435A8 4600C18D */ trunc.w.s $f6, $f24 -/* C7A28C 802435AC 44063000 */ mfc1 $a2, $f6 -/* C7A290 802435B0 0C0B2026 */ jal set_variable -/* C7A294 802435B4 0200282D */ daddu $a1, $s0, $zero -/* C7A298 802435B8 8FBF0024 */ lw $ra, 0x24($sp) -/* C7A29C 802435BC 8FB40020 */ lw $s4, 0x20($sp) -/* C7A2A0 802435C0 8FB3001C */ lw $s3, 0x1c($sp) -/* C7A2A4 802435C4 8FB20018 */ lw $s2, 0x18($sp) -/* C7A2A8 802435C8 8FB10014 */ lw $s1, 0x14($sp) -/* C7A2AC 802435CC 8FB00010 */ lw $s0, 0x10($sp) -/* C7A2B0 802435D0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C7A2B4 802435D4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C7A2B8 802435D8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* C7A2BC 802435DC D7B60030 */ ldc1 $f22, 0x30($sp) -/* C7A2C0 802435E0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C7A2C4 802435E4 24020002 */ addiu $v0, $zero, 2 -/* C7A2C8 802435E8 03E00008 */ jr $ra -/* C7A2CC 802435EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242710_C881C0.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242710_C881C0.s deleted file mode 100644 index ca10133db9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242710_C881C0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242710_C881C0 -/* C881C0 80242710 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C881C4 80242714 AFB10014 */ sw $s1, 0x14($sp) -/* C881C8 80242718 0080882D */ daddu $s1, $a0, $zero -/* C881CC 8024271C AFBF0024 */ sw $ra, 0x24($sp) -/* C881D0 80242720 AFB40020 */ sw $s4, 0x20($sp) -/* C881D4 80242724 AFB3001C */ sw $s3, 0x1c($sp) -/* C881D8 80242728 AFB20018 */ sw $s2, 0x18($sp) -/* C881DC 8024272C AFB00010 */ sw $s0, 0x10($sp) -/* C881E0 80242730 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C881E4 80242734 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C881E8 80242738 F7B80038 */ sdc1 $f24, 0x38($sp) -/* C881EC 8024273C F7B60030 */ sdc1 $f22, 0x30($sp) -/* C881F0 80242740 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C881F4 80242744 8E30000C */ lw $s0, 0xc($s1) -/* C881F8 80242748 8E130000 */ lw $s3, ($s0) -/* C881FC 8024274C 26100004 */ addiu $s0, $s0, 4 -/* C88200 80242750 0C0B1EAF */ jal get_variable -/* C88204 80242754 0260282D */ daddu $a1, $s3, $zero -/* C88208 80242758 4482E000 */ mtc1 $v0, $f28 -/* C8820C 8024275C 00000000 */ nop -/* C88210 80242760 4680E720 */ cvt.s.w $f28, $f28 -/* C88214 80242764 8E140000 */ lw $s4, ($s0) -/* C88218 80242768 26100004 */ addiu $s0, $s0, 4 -/* C8821C 8024276C 0220202D */ daddu $a0, $s1, $zero -/* C88220 80242770 0C0B1EAF */ jal get_variable -/* C88224 80242774 0280282D */ daddu $a1, $s4, $zero -/* C88228 80242778 4482D000 */ mtc1 $v0, $f26 -/* C8822C 8024277C 00000000 */ nop -/* C88230 80242780 4680D6A0 */ cvt.s.w $f26, $f26 -/* C88234 80242784 8E100000 */ lw $s0, ($s0) -/* C88238 80242788 0220202D */ daddu $a0, $s1, $zero -/* C8823C 8024278C 0C0B1EAF */ jal get_variable -/* C88240 80242790 0200282D */ daddu $a1, $s0, $zero -/* C88244 80242794 4482C000 */ mtc1 $v0, $f24 -/* C88248 80242798 00000000 */ nop -/* C8824C 8024279C 4680C620 */ cvt.s.w $f24, $f24 -/* C88250 802427A0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C88254 802427A4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C88258 802427A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C8825C 802427AC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C88260 802427B0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C88264 802427B4 44800000 */ mtc1 $zero, $f0 -/* C88268 802427B8 00031080 */ sll $v0, $v1, 2 -/* C8826C 802427BC 00431021 */ addu $v0, $v0, $v1 -/* C88270 802427C0 00021080 */ sll $v0, $v0, 2 -/* C88274 802427C4 00431023 */ subu $v0, $v0, $v1 -/* C88278 802427C8 000218C0 */ sll $v1, $v0, 3 -/* C8827C 802427CC 00431021 */ addu $v0, $v0, $v1 -/* C88280 802427D0 000210C0 */ sll $v0, $v0, 3 -/* C88284 802427D4 46001032 */ c.eq.s $f2, $f0 -/* C88288 802427D8 3C01800B */ lui $at, 0x800b -/* C8828C 802427DC 00220821 */ addu $at, $at, $v0 -/* C88290 802427E0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C88294 802427E4 45000005 */ bc1f .L802427FC -/* C88298 802427E8 00000000 */ nop -/* C8829C 802427EC 3C0142C8 */ lui $at, 0x42c8 -/* C882A0 802427F0 44810000 */ mtc1 $at, $f0 -/* C882A4 802427F4 08090A03 */ j .L8024280C -/* C882A8 802427F8 4600B581 */ sub.s $f22, $f22, $f0 -.L802427FC: -/* C882AC 802427FC 3C0142C8 */ lui $at, 0x42c8 -/* C882B0 80242800 44810000 */ mtc1 $at, $f0 -/* C882B4 80242804 00000000 */ nop -/* C882B8 80242808 4600B580 */ add.s $f22, $f22, $f0 -.L8024280C: -/* C882BC 8024280C 0C00A6C9 */ jal clamp_angle -/* C882C0 80242810 4600B306 */ mov.s $f12, $f22 -/* C882C4 80242814 46000586 */ mov.s $f22, $f0 -/* C882C8 80242818 3C014170 */ lui $at, 0x4170 -/* C882CC 8024281C 4481A000 */ mtc1 $at, $f20 -/* C882D0 80242820 0C00A8BB */ jal sin_deg -/* C882D4 80242824 4600B306 */ mov.s $f12, $f22 -/* C882D8 80242828 46140002 */ mul.s $f0, $f0, $f20 -/* C882DC 8024282C 00000000 */ nop -/* C882E0 80242830 864200B0 */ lh $v0, 0xb0($s2) -/* C882E4 80242834 3C013F00 */ lui $at, 0x3f00 -/* C882E8 80242838 44812000 */ mtc1 $at, $f4 -/* C882EC 8024283C 44821000 */ mtc1 $v0, $f2 -/* C882F0 80242840 00000000 */ nop -/* C882F4 80242844 468010A0 */ cvt.s.w $f2, $f2 -/* C882F8 80242848 46041082 */ mul.s $f2, $f2, $f4 -/* C882FC 8024284C 00000000 */ nop -/* C88300 80242850 4600E700 */ add.s $f28, $f28, $f0 -/* C88304 80242854 4602D680 */ add.s $f26, $f26, $f2 -/* C88308 80242858 0C00A8D4 */ jal cos_deg -/* C8830C 8024285C 4600B306 */ mov.s $f12, $f22 -/* C88310 80242860 46140002 */ mul.s $f0, $f0, $f20 -/* C88314 80242864 00000000 */ nop -/* C88318 80242868 0220202D */ daddu $a0, $s1, $zero -/* C8831C 8024286C 0260282D */ daddu $a1, $s3, $zero -/* C88320 80242870 4600E18D */ trunc.w.s $f6, $f28 -/* C88324 80242874 44063000 */ mfc1 $a2, $f6 -/* C88328 80242878 0C0B2026 */ jal set_variable -/* C8832C 8024287C 4600C601 */ sub.s $f24, $f24, $f0 -/* C88330 80242880 0220202D */ daddu $a0, $s1, $zero -/* C88334 80242884 4600D18D */ trunc.w.s $f6, $f26 -/* C88338 80242888 44063000 */ mfc1 $a2, $f6 -/* C8833C 8024288C 0C0B2026 */ jal set_variable -/* C88340 80242890 0280282D */ daddu $a1, $s4, $zero -/* C88344 80242894 0220202D */ daddu $a0, $s1, $zero -/* C88348 80242898 4600C18D */ trunc.w.s $f6, $f24 -/* C8834C 8024289C 44063000 */ mfc1 $a2, $f6 -/* C88350 802428A0 0C0B2026 */ jal set_variable -/* C88354 802428A4 0200282D */ daddu $a1, $s0, $zero -/* C88358 802428A8 8FBF0024 */ lw $ra, 0x24($sp) -/* C8835C 802428AC 8FB40020 */ lw $s4, 0x20($sp) -/* C88360 802428B0 8FB3001C */ lw $s3, 0x1c($sp) -/* C88364 802428B4 8FB20018 */ lw $s2, 0x18($sp) -/* C88368 802428B8 8FB10014 */ lw $s1, 0x14($sp) -/* C8836C 802428BC 8FB00010 */ lw $s0, 0x10($sp) -/* C88370 802428C0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C88374 802428C4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C88378 802428C8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* C8837C 802428CC D7B60030 */ ldc1 $f22, 0x30($sp) -/* C88380 802428D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C88384 802428D4 24020002 */ addiu $v0, $zero, 2 -/* C88388 802428D8 03E00008 */ jr $ra -/* C8838C 802428DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802415DC.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802415DC.s deleted file mode 100644 index 27d699f5f2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802415DC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415DC -/* C8F18C 802415DC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C8F190 802415E0 AFB10014 */ sw $s1, 0x14($sp) -/* C8F194 802415E4 0080882D */ daddu $s1, $a0, $zero -/* C8F198 802415E8 AFBF0024 */ sw $ra, 0x24($sp) -/* C8F19C 802415EC AFB40020 */ sw $s4, 0x20($sp) -/* C8F1A0 802415F0 AFB3001C */ sw $s3, 0x1c($sp) -/* C8F1A4 802415F4 AFB20018 */ sw $s2, 0x18($sp) -/* C8F1A8 802415F8 AFB00010 */ sw $s0, 0x10($sp) -/* C8F1AC 802415FC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C8F1B0 80241600 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C8F1B4 80241604 F7B80038 */ sdc1 $f24, 0x38($sp) -/* C8F1B8 80241608 F7B60030 */ sdc1 $f22, 0x30($sp) -/* C8F1BC 8024160C F7B40028 */ sdc1 $f20, 0x28($sp) -/* C8F1C0 80241610 8E30000C */ lw $s0, 0xc($s1) -/* C8F1C4 80241614 8E130000 */ lw $s3, ($s0) -/* C8F1C8 80241618 26100004 */ addiu $s0, $s0, 4 -/* C8F1CC 8024161C 0C0B1EAF */ jal get_variable -/* C8F1D0 80241620 0260282D */ daddu $a1, $s3, $zero -/* C8F1D4 80241624 4482E000 */ mtc1 $v0, $f28 -/* C8F1D8 80241628 00000000 */ nop -/* C8F1DC 8024162C 4680E720 */ cvt.s.w $f28, $f28 -/* C8F1E0 80241630 8E140000 */ lw $s4, ($s0) -/* C8F1E4 80241634 26100004 */ addiu $s0, $s0, 4 -/* C8F1E8 80241638 0220202D */ daddu $a0, $s1, $zero -/* C8F1EC 8024163C 0C0B1EAF */ jal get_variable -/* C8F1F0 80241640 0280282D */ daddu $a1, $s4, $zero -/* C8F1F4 80241644 4482D000 */ mtc1 $v0, $f26 -/* C8F1F8 80241648 00000000 */ nop -/* C8F1FC 8024164C 4680D6A0 */ cvt.s.w $f26, $f26 -/* C8F200 80241650 8E100000 */ lw $s0, ($s0) -/* C8F204 80241654 0220202D */ daddu $a0, $s1, $zero -/* C8F208 80241658 0C0B1EAF */ jal get_variable -/* C8F20C 8024165C 0200282D */ daddu $a1, $s0, $zero -/* C8F210 80241660 4482C000 */ mtc1 $v0, $f24 -/* C8F214 80241664 00000000 */ nop -/* C8F218 80241668 4680C620 */ cvt.s.w $f24, $f24 -/* C8F21C 8024166C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C8F220 80241670 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C8F224 80241674 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C8F228 80241678 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C8F22C 8024167C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C8F230 80241680 44800000 */ mtc1 $zero, $f0 -/* C8F234 80241684 00031080 */ sll $v0, $v1, 2 -/* C8F238 80241688 00431021 */ addu $v0, $v0, $v1 -/* C8F23C 8024168C 00021080 */ sll $v0, $v0, 2 -/* C8F240 80241690 00431023 */ subu $v0, $v0, $v1 -/* C8F244 80241694 000218C0 */ sll $v1, $v0, 3 -/* C8F248 80241698 00431021 */ addu $v0, $v0, $v1 -/* C8F24C 8024169C 000210C0 */ sll $v0, $v0, 3 -/* C8F250 802416A0 46001032 */ c.eq.s $f2, $f0 -/* C8F254 802416A4 3C01800B */ lui $at, 0x800b -/* C8F258 802416A8 00220821 */ addu $at, $at, $v0 -/* C8F25C 802416AC C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C8F260 802416B0 45000005 */ bc1f .L802416C8 -/* C8F264 802416B4 00000000 */ nop -/* C8F268 802416B8 3C0142C8 */ lui $at, 0x42c8 -/* C8F26C 802416BC 44810000 */ mtc1 $at, $f0 -/* C8F270 802416C0 080905B6 */ j .L802416D8 -/* C8F274 802416C4 4600B581 */ sub.s $f22, $f22, $f0 -.L802416C8: -/* C8F278 802416C8 3C0142C8 */ lui $at, 0x42c8 -/* C8F27C 802416CC 44810000 */ mtc1 $at, $f0 -/* C8F280 802416D0 00000000 */ nop -/* C8F284 802416D4 4600B580 */ add.s $f22, $f22, $f0 -.L802416D8: -/* C8F288 802416D8 0C00A6C9 */ jal clamp_angle -/* C8F28C 802416DC 4600B306 */ mov.s $f12, $f22 -/* C8F290 802416E0 46000586 */ mov.s $f22, $f0 -/* C8F294 802416E4 3C014170 */ lui $at, 0x4170 -/* C8F298 802416E8 4481A000 */ mtc1 $at, $f20 -/* C8F29C 802416EC 0C00A8BB */ jal sin_deg -/* C8F2A0 802416F0 4600B306 */ mov.s $f12, $f22 -/* C8F2A4 802416F4 46140002 */ mul.s $f0, $f0, $f20 -/* C8F2A8 802416F8 00000000 */ nop -/* C8F2AC 802416FC 864200B0 */ lh $v0, 0xb0($s2) -/* C8F2B0 80241700 3C013F00 */ lui $at, 0x3f00 -/* C8F2B4 80241704 44812000 */ mtc1 $at, $f4 -/* C8F2B8 80241708 44821000 */ mtc1 $v0, $f2 -/* C8F2BC 8024170C 00000000 */ nop -/* C8F2C0 80241710 468010A0 */ cvt.s.w $f2, $f2 -/* C8F2C4 80241714 46041082 */ mul.s $f2, $f2, $f4 -/* C8F2C8 80241718 00000000 */ nop -/* C8F2CC 8024171C 4600E700 */ add.s $f28, $f28, $f0 -/* C8F2D0 80241720 4602D680 */ add.s $f26, $f26, $f2 -/* C8F2D4 80241724 0C00A8D4 */ jal cos_deg -/* C8F2D8 80241728 4600B306 */ mov.s $f12, $f22 -/* C8F2DC 8024172C 46140002 */ mul.s $f0, $f0, $f20 -/* C8F2E0 80241730 00000000 */ nop -/* C8F2E4 80241734 0220202D */ daddu $a0, $s1, $zero -/* C8F2E8 80241738 0260282D */ daddu $a1, $s3, $zero -/* C8F2EC 8024173C 4600E18D */ trunc.w.s $f6, $f28 -/* C8F2F0 80241740 44063000 */ mfc1 $a2, $f6 -/* C8F2F4 80241744 0C0B2026 */ jal set_variable -/* C8F2F8 80241748 4600C601 */ sub.s $f24, $f24, $f0 -/* C8F2FC 8024174C 0220202D */ daddu $a0, $s1, $zero -/* C8F300 80241750 4600D18D */ trunc.w.s $f6, $f26 -/* C8F304 80241754 44063000 */ mfc1 $a2, $f6 -/* C8F308 80241758 0C0B2026 */ jal set_variable -/* C8F30C 8024175C 0280282D */ daddu $a1, $s4, $zero -/* C8F310 80241760 0220202D */ daddu $a0, $s1, $zero -/* C8F314 80241764 4600C18D */ trunc.w.s $f6, $f24 -/* C8F318 80241768 44063000 */ mfc1 $a2, $f6 -/* C8F31C 8024176C 0C0B2026 */ jal set_variable -/* C8F320 80241770 0200282D */ daddu $a1, $s0, $zero -/* C8F324 80241774 8FBF0024 */ lw $ra, 0x24($sp) -/* C8F328 80241778 8FB40020 */ lw $s4, 0x20($sp) -/* C8F32C 8024177C 8FB3001C */ lw $s3, 0x1c($sp) -/* C8F330 80241780 8FB20018 */ lw $s2, 0x18($sp) -/* C8F334 80241784 8FB10014 */ lw $s1, 0x14($sp) -/* C8F338 80241788 8FB00010 */ lw $s0, 0x10($sp) -/* C8F33C 8024178C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C8F340 80241790 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C8F344 80241794 D7B80038 */ ldc1 $f24, 0x38($sp) -/* C8F348 80241798 D7B60030 */ ldc1 $f22, 0x30($sp) -/* C8F34C 8024179C D7B40028 */ ldc1 $f20, 0x28($sp) -/* C8F350 802417A0 24020002 */ addiu $v0, $zero, 2 -/* C8F354 802417A4 03E00008 */ jr $ra -/* C8F358 802417A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240484_C963B4.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240484_C963B4.s deleted file mode 100644 index afcbefaf3d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240484_C963B4.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240484_C963B4 -/* C963B4 80240484 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C963B8 80240488 AFB10014 */ sw $s1, 0x14($sp) -/* C963BC 8024048C 0080882D */ daddu $s1, $a0, $zero -/* C963C0 80240490 AFBF0024 */ sw $ra, 0x24($sp) -/* C963C4 80240494 AFB40020 */ sw $s4, 0x20($sp) -/* C963C8 80240498 AFB3001C */ sw $s3, 0x1c($sp) -/* C963CC 8024049C AFB20018 */ sw $s2, 0x18($sp) -/* C963D0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* C963D4 802404A4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C963D8 802404A8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C963DC 802404AC F7B80038 */ sdc1 $f24, 0x38($sp) -/* C963E0 802404B0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* C963E4 802404B4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C963E8 802404B8 8E30000C */ lw $s0, 0xc($s1) -/* C963EC 802404BC 8E130000 */ lw $s3, ($s0) -/* C963F0 802404C0 26100004 */ addiu $s0, $s0, 4 -/* C963F4 802404C4 0C0B1EAF */ jal get_variable -/* C963F8 802404C8 0260282D */ daddu $a1, $s3, $zero -/* C963FC 802404CC 4482E000 */ mtc1 $v0, $f28 -/* C96400 802404D0 00000000 */ nop -/* C96404 802404D4 4680E720 */ cvt.s.w $f28, $f28 -/* C96408 802404D8 8E140000 */ lw $s4, ($s0) -/* C9640C 802404DC 26100004 */ addiu $s0, $s0, 4 -/* C96410 802404E0 0220202D */ daddu $a0, $s1, $zero -/* C96414 802404E4 0C0B1EAF */ jal get_variable -/* C96418 802404E8 0280282D */ daddu $a1, $s4, $zero -/* C9641C 802404EC 4482D000 */ mtc1 $v0, $f26 -/* C96420 802404F0 00000000 */ nop -/* C96424 802404F4 4680D6A0 */ cvt.s.w $f26, $f26 -/* C96428 802404F8 8E100000 */ lw $s0, ($s0) -/* C9642C 802404FC 0220202D */ daddu $a0, $s1, $zero -/* C96430 80240500 0C0B1EAF */ jal get_variable -/* C96434 80240504 0200282D */ daddu $a1, $s0, $zero -/* C96438 80240508 4482C000 */ mtc1 $v0, $f24 -/* C9643C 8024050C 00000000 */ nop -/* C96440 80240510 4680C620 */ cvt.s.w $f24, $f24 -/* C96444 80240514 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C96448 80240518 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C9644C 8024051C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C96450 80240520 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C96454 80240524 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C96458 80240528 44800000 */ mtc1 $zero, $f0 -/* C9645C 8024052C 00031080 */ sll $v0, $v1, 2 -/* C96460 80240530 00431021 */ addu $v0, $v0, $v1 -/* C96464 80240534 00021080 */ sll $v0, $v0, 2 -/* C96468 80240538 00431023 */ subu $v0, $v0, $v1 -/* C9646C 8024053C 000218C0 */ sll $v1, $v0, 3 -/* C96470 80240540 00431021 */ addu $v0, $v0, $v1 -/* C96474 80240544 000210C0 */ sll $v0, $v0, 3 -/* C96478 80240548 46001032 */ c.eq.s $f2, $f0 -/* C9647C 8024054C 3C01800B */ lui $at, 0x800b -/* C96480 80240550 00220821 */ addu $at, $at, $v0 -/* C96484 80240554 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C96488 80240558 45000005 */ bc1f .L80240570 -/* C9648C 8024055C 00000000 */ nop -/* C96490 80240560 3C0142C8 */ lui $at, 0x42c8 -/* C96494 80240564 44810000 */ mtc1 $at, $f0 -/* C96498 80240568 08090160 */ j .L80240580 -/* C9649C 8024056C 4600B581 */ sub.s $f22, $f22, $f0 -.L80240570: -/* C964A0 80240570 3C0142C8 */ lui $at, 0x42c8 -/* C964A4 80240574 44810000 */ mtc1 $at, $f0 -/* C964A8 80240578 00000000 */ nop -/* C964AC 8024057C 4600B580 */ add.s $f22, $f22, $f0 -.L80240580: -/* C964B0 80240580 0C00A6C9 */ jal clamp_angle -/* C964B4 80240584 4600B306 */ mov.s $f12, $f22 -/* C964B8 80240588 46000586 */ mov.s $f22, $f0 -/* C964BC 8024058C 3C014170 */ lui $at, 0x4170 -/* C964C0 80240590 4481A000 */ mtc1 $at, $f20 -/* C964C4 80240594 0C00A8BB */ jal sin_deg -/* C964C8 80240598 4600B306 */ mov.s $f12, $f22 -/* C964CC 8024059C 46140002 */ mul.s $f0, $f0, $f20 -/* C964D0 802405A0 00000000 */ nop -/* C964D4 802405A4 864200B0 */ lh $v0, 0xb0($s2) -/* C964D8 802405A8 3C013F00 */ lui $at, 0x3f00 -/* C964DC 802405AC 44812000 */ mtc1 $at, $f4 -/* C964E0 802405B0 44821000 */ mtc1 $v0, $f2 -/* C964E4 802405B4 00000000 */ nop -/* C964E8 802405B8 468010A0 */ cvt.s.w $f2, $f2 -/* C964EC 802405BC 46041082 */ mul.s $f2, $f2, $f4 -/* C964F0 802405C0 00000000 */ nop -/* C964F4 802405C4 4600E700 */ add.s $f28, $f28, $f0 -/* C964F8 802405C8 4602D680 */ add.s $f26, $f26, $f2 -/* C964FC 802405CC 0C00A8D4 */ jal cos_deg -/* C96500 802405D0 4600B306 */ mov.s $f12, $f22 -/* C96504 802405D4 46140002 */ mul.s $f0, $f0, $f20 -/* C96508 802405D8 00000000 */ nop -/* C9650C 802405DC 0220202D */ daddu $a0, $s1, $zero -/* C96510 802405E0 0260282D */ daddu $a1, $s3, $zero -/* C96514 802405E4 4600E18D */ trunc.w.s $f6, $f28 -/* C96518 802405E8 44063000 */ mfc1 $a2, $f6 -/* C9651C 802405EC 0C0B2026 */ jal set_variable -/* C96520 802405F0 4600C601 */ sub.s $f24, $f24, $f0 -/* C96524 802405F4 0220202D */ daddu $a0, $s1, $zero -/* C96528 802405F8 4600D18D */ trunc.w.s $f6, $f26 -/* C9652C 802405FC 44063000 */ mfc1 $a2, $f6 -/* C96530 80240600 0C0B2026 */ jal set_variable -/* C96534 80240604 0280282D */ daddu $a1, $s4, $zero -/* C96538 80240608 0220202D */ daddu $a0, $s1, $zero -/* C9653C 8024060C 4600C18D */ trunc.w.s $f6, $f24 -/* C96540 80240610 44063000 */ mfc1 $a2, $f6 -/* C96544 80240614 0C0B2026 */ jal set_variable -/* C96548 80240618 0200282D */ daddu $a1, $s0, $zero -/* C9654C 8024061C 8FBF0024 */ lw $ra, 0x24($sp) -/* C96550 80240620 8FB40020 */ lw $s4, 0x20($sp) -/* C96554 80240624 8FB3001C */ lw $s3, 0x1c($sp) -/* C96558 80240628 8FB20018 */ lw $s2, 0x18($sp) -/* C9655C 8024062C 8FB10014 */ lw $s1, 0x14($sp) -/* C96560 80240630 8FB00010 */ lw $s0, 0x10($sp) -/* C96564 80240634 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C96568 80240638 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C9656C 8024063C D7B80038 */ ldc1 $f24, 0x38($sp) -/* C96570 80240640 D7B60030 */ ldc1 $f22, 0x30($sp) -/* C96574 80240644 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C96578 80240648 24020002 */ addiu $v0, $zero, 2 -/* C9657C 8024064C 03E00008 */ jr $ra -/* C96580 80240650 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241720.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241720.s deleted file mode 100644 index 86390ce0b3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241720.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241720 -/* 7EC430 80241720 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 7EC434 80241724 AFB10014 */ sw $s1, 0x14($sp) -/* 7EC438 80241728 0080882D */ daddu $s1, $a0, $zero -/* 7EC43C 8024172C AFBF0024 */ sw $ra, 0x24($sp) -/* 7EC440 80241730 AFB40020 */ sw $s4, 0x20($sp) -/* 7EC444 80241734 AFB3001C */ sw $s3, 0x1c($sp) -/* 7EC448 80241738 AFB20018 */ sw $s2, 0x18($sp) -/* 7EC44C 8024173C AFB00010 */ sw $s0, 0x10($sp) -/* 7EC450 80241740 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 7EC454 80241744 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 7EC458 80241748 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 7EC45C 8024174C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 7EC460 80241750 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 7EC464 80241754 8E30000C */ lw $s0, 0xc($s1) -/* 7EC468 80241758 8E130000 */ lw $s3, ($s0) -/* 7EC46C 8024175C 26100004 */ addiu $s0, $s0, 4 -/* 7EC470 80241760 0C0B1EAF */ jal get_variable -/* 7EC474 80241764 0260282D */ daddu $a1, $s3, $zero -/* 7EC478 80241768 4482E000 */ mtc1 $v0, $f28 -/* 7EC47C 8024176C 00000000 */ nop -/* 7EC480 80241770 4680E720 */ cvt.s.w $f28, $f28 -/* 7EC484 80241774 8E140000 */ lw $s4, ($s0) -/* 7EC488 80241778 26100004 */ addiu $s0, $s0, 4 -/* 7EC48C 8024177C 0220202D */ daddu $a0, $s1, $zero -/* 7EC490 80241780 0C0B1EAF */ jal get_variable -/* 7EC494 80241784 0280282D */ daddu $a1, $s4, $zero -/* 7EC498 80241788 4482D000 */ mtc1 $v0, $f26 -/* 7EC49C 8024178C 00000000 */ nop -/* 7EC4A0 80241790 4680D6A0 */ cvt.s.w $f26, $f26 -/* 7EC4A4 80241794 8E100000 */ lw $s0, ($s0) -/* 7EC4A8 80241798 0220202D */ daddu $a0, $s1, $zero -/* 7EC4AC 8024179C 0C0B1EAF */ jal get_variable -/* 7EC4B0 802417A0 0200282D */ daddu $a1, $s0, $zero -/* 7EC4B4 802417A4 4482C000 */ mtc1 $v0, $f24 -/* 7EC4B8 802417A8 00000000 */ nop -/* 7EC4BC 802417AC 4680C620 */ cvt.s.w $f24, $f24 -/* 7EC4C0 802417B0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 7EC4C4 802417B4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 7EC4C8 802417B8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 7EC4CC 802417BC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7EC4D0 802417C0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 7EC4D4 802417C4 44800000 */ mtc1 $zero, $f0 -/* 7EC4D8 802417C8 00031080 */ sll $v0, $v1, 2 -/* 7EC4DC 802417CC 00431021 */ addu $v0, $v0, $v1 -/* 7EC4E0 802417D0 00021080 */ sll $v0, $v0, 2 -/* 7EC4E4 802417D4 00431023 */ subu $v0, $v0, $v1 -/* 7EC4E8 802417D8 000218C0 */ sll $v1, $v0, 3 -/* 7EC4EC 802417DC 00431021 */ addu $v0, $v0, $v1 -/* 7EC4F0 802417E0 000210C0 */ sll $v0, $v0, 3 -/* 7EC4F4 802417E4 46001032 */ c.eq.s $f2, $f0 -/* 7EC4F8 802417E8 3C01800B */ lui $at, 0x800b -/* 7EC4FC 802417EC 00220821 */ addu $at, $at, $v0 -/* 7EC500 802417F0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 7EC504 802417F4 45000005 */ bc1f .L8024180C -/* 7EC508 802417F8 00000000 */ nop -/* 7EC50C 802417FC 3C0142C8 */ lui $at, 0x42c8 -/* 7EC510 80241800 44810000 */ mtc1 $at, $f0 -/* 7EC514 80241804 08090607 */ j .L8024181C -/* 7EC518 80241808 4600B581 */ sub.s $f22, $f22, $f0 -.L8024180C: -/* 7EC51C 8024180C 3C0142C8 */ lui $at, 0x42c8 -/* 7EC520 80241810 44810000 */ mtc1 $at, $f0 -/* 7EC524 80241814 00000000 */ nop -/* 7EC528 80241818 4600B580 */ add.s $f22, $f22, $f0 -.L8024181C: -/* 7EC52C 8024181C 0C00A6C9 */ jal clamp_angle -/* 7EC530 80241820 4600B306 */ mov.s $f12, $f22 -/* 7EC534 80241824 46000586 */ mov.s $f22, $f0 -/* 7EC538 80241828 3C014170 */ lui $at, 0x4170 -/* 7EC53C 8024182C 4481A000 */ mtc1 $at, $f20 -/* 7EC540 80241830 0C00A8BB */ jal sin_deg -/* 7EC544 80241834 4600B306 */ mov.s $f12, $f22 -/* 7EC548 80241838 46140002 */ mul.s $f0, $f0, $f20 -/* 7EC54C 8024183C 00000000 */ nop -/* 7EC550 80241840 864200B0 */ lh $v0, 0xb0($s2) -/* 7EC554 80241844 3C013F00 */ lui $at, 0x3f00 -/* 7EC558 80241848 44812000 */ mtc1 $at, $f4 -/* 7EC55C 8024184C 44821000 */ mtc1 $v0, $f2 -/* 7EC560 80241850 00000000 */ nop -/* 7EC564 80241854 468010A0 */ cvt.s.w $f2, $f2 -/* 7EC568 80241858 46041082 */ mul.s $f2, $f2, $f4 -/* 7EC56C 8024185C 00000000 */ nop -/* 7EC570 80241860 4600E700 */ add.s $f28, $f28, $f0 -/* 7EC574 80241864 4602D680 */ add.s $f26, $f26, $f2 -/* 7EC578 80241868 0C00A8D4 */ jal cos_deg -/* 7EC57C 8024186C 4600B306 */ mov.s $f12, $f22 -/* 7EC580 80241870 46140002 */ mul.s $f0, $f0, $f20 -/* 7EC584 80241874 00000000 */ nop -/* 7EC588 80241878 0220202D */ daddu $a0, $s1, $zero -/* 7EC58C 8024187C 0260282D */ daddu $a1, $s3, $zero -/* 7EC590 80241880 4600E18D */ trunc.w.s $f6, $f28 -/* 7EC594 80241884 44063000 */ mfc1 $a2, $f6 -/* 7EC598 80241888 0C0B2026 */ jal set_variable -/* 7EC59C 8024188C 4600C601 */ sub.s $f24, $f24, $f0 -/* 7EC5A0 80241890 0220202D */ daddu $a0, $s1, $zero -/* 7EC5A4 80241894 4600D18D */ trunc.w.s $f6, $f26 -/* 7EC5A8 80241898 44063000 */ mfc1 $a2, $f6 -/* 7EC5AC 8024189C 0C0B2026 */ jal set_variable -/* 7EC5B0 802418A0 0280282D */ daddu $a1, $s4, $zero -/* 7EC5B4 802418A4 0220202D */ daddu $a0, $s1, $zero -/* 7EC5B8 802418A8 4600C18D */ trunc.w.s $f6, $f24 -/* 7EC5BC 802418AC 44063000 */ mfc1 $a2, $f6 -/* 7EC5C0 802418B0 0C0B2026 */ jal set_variable -/* 7EC5C4 802418B4 0200282D */ daddu $a1, $s0, $zero -/* 7EC5C8 802418B8 8FBF0024 */ lw $ra, 0x24($sp) -/* 7EC5CC 802418BC 8FB40020 */ lw $s4, 0x20($sp) -/* 7EC5D0 802418C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 7EC5D4 802418C4 8FB20018 */ lw $s2, 0x18($sp) -/* 7EC5D8 802418C8 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC5DC 802418CC 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC5E0 802418D0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 7EC5E4 802418D4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 7EC5E8 802418D8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 7EC5EC 802418DC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 7EC5F0 802418E0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 7EC5F4 802418E4 24020002 */ addiu $v0, $zero, 2 -/* 7EC5F8 802418E8 03E00008 */ jr $ra -/* 7EC5FC 802418EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243574.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243574.s deleted file mode 100644 index 52b8f3e1c7..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243574.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243574 -/* 7EE284 80243574 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 7EE288 80243578 AFB10014 */ sw $s1, 0x14($sp) -/* 7EE28C 8024357C 0080882D */ daddu $s1, $a0, $zero -/* 7EE290 80243580 AFBF0024 */ sw $ra, 0x24($sp) -/* 7EE294 80243584 AFB40020 */ sw $s4, 0x20($sp) -/* 7EE298 80243588 AFB3001C */ sw $s3, 0x1c($sp) -/* 7EE29C 8024358C AFB20018 */ sw $s2, 0x18($sp) -/* 7EE2A0 80243590 AFB00010 */ sw $s0, 0x10($sp) -/* 7EE2A4 80243594 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 7EE2A8 80243598 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 7EE2AC 8024359C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 7EE2B0 802435A0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 7EE2B4 802435A4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 7EE2B8 802435A8 8E30000C */ lw $s0, 0xc($s1) -/* 7EE2BC 802435AC 8E130000 */ lw $s3, ($s0) -/* 7EE2C0 802435B0 26100004 */ addiu $s0, $s0, 4 -/* 7EE2C4 802435B4 0C0B1EAF */ jal get_variable -/* 7EE2C8 802435B8 0260282D */ daddu $a1, $s3, $zero -/* 7EE2CC 802435BC 4482E000 */ mtc1 $v0, $f28 -/* 7EE2D0 802435C0 00000000 */ nop -/* 7EE2D4 802435C4 4680E720 */ cvt.s.w $f28, $f28 -/* 7EE2D8 802435C8 8E140000 */ lw $s4, ($s0) -/* 7EE2DC 802435CC 26100004 */ addiu $s0, $s0, 4 -/* 7EE2E0 802435D0 0220202D */ daddu $a0, $s1, $zero -/* 7EE2E4 802435D4 0C0B1EAF */ jal get_variable -/* 7EE2E8 802435D8 0280282D */ daddu $a1, $s4, $zero -/* 7EE2EC 802435DC 4482D000 */ mtc1 $v0, $f26 -/* 7EE2F0 802435E0 00000000 */ nop -/* 7EE2F4 802435E4 4680D6A0 */ cvt.s.w $f26, $f26 -/* 7EE2F8 802435E8 8E100000 */ lw $s0, ($s0) -/* 7EE2FC 802435EC 0220202D */ daddu $a0, $s1, $zero -/* 7EE300 802435F0 0C0B1EAF */ jal get_variable -/* 7EE304 802435F4 0200282D */ daddu $a1, $s0, $zero -/* 7EE308 802435F8 4482C000 */ mtc1 $v0, $f24 -/* 7EE30C 802435FC 00000000 */ nop -/* 7EE310 80243600 4680C620 */ cvt.s.w $f24, $f24 -/* 7EE314 80243604 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 7EE318 80243608 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 7EE31C 8024360C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 7EE320 80243610 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7EE324 80243614 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 7EE328 80243618 44800000 */ mtc1 $zero, $f0 -/* 7EE32C 8024361C 00031080 */ sll $v0, $v1, 2 -/* 7EE330 80243620 00431021 */ addu $v0, $v0, $v1 -/* 7EE334 80243624 00021080 */ sll $v0, $v0, 2 -/* 7EE338 80243628 00431023 */ subu $v0, $v0, $v1 -/* 7EE33C 8024362C 000218C0 */ sll $v1, $v0, 3 -/* 7EE340 80243630 00431021 */ addu $v0, $v0, $v1 -/* 7EE344 80243634 000210C0 */ sll $v0, $v0, 3 -/* 7EE348 80243638 46001032 */ c.eq.s $f2, $f0 -/* 7EE34C 8024363C 3C01800B */ lui $at, 0x800b -/* 7EE350 80243640 00220821 */ addu $at, $at, $v0 -/* 7EE354 80243644 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 7EE358 80243648 45000005 */ bc1f .L80243660 -/* 7EE35C 8024364C 00000000 */ nop -/* 7EE360 80243650 3C0142C8 */ lui $at, 0x42c8 -/* 7EE364 80243654 44810000 */ mtc1 $at, $f0 -/* 7EE368 80243658 08090D9C */ j .L80243670 -/* 7EE36C 8024365C 4600B581 */ sub.s $f22, $f22, $f0 -.L80243660: -/* 7EE370 80243660 3C0142C8 */ lui $at, 0x42c8 -/* 7EE374 80243664 44810000 */ mtc1 $at, $f0 -/* 7EE378 80243668 00000000 */ nop -/* 7EE37C 8024366C 4600B580 */ add.s $f22, $f22, $f0 -.L80243670: -/* 7EE380 80243670 0C00A6C9 */ jal clamp_angle -/* 7EE384 80243674 4600B306 */ mov.s $f12, $f22 -/* 7EE388 80243678 46000586 */ mov.s $f22, $f0 -/* 7EE38C 8024367C 3C014170 */ lui $at, 0x4170 -/* 7EE390 80243680 4481A000 */ mtc1 $at, $f20 -/* 7EE394 80243684 0C00A8BB */ jal sin_deg -/* 7EE398 80243688 4600B306 */ mov.s $f12, $f22 -/* 7EE39C 8024368C 46140002 */ mul.s $f0, $f0, $f20 -/* 7EE3A0 80243690 00000000 */ nop -/* 7EE3A4 80243694 864200B0 */ lh $v0, 0xb0($s2) -/* 7EE3A8 80243698 3C013F00 */ lui $at, 0x3f00 -/* 7EE3AC 8024369C 44812000 */ mtc1 $at, $f4 -/* 7EE3B0 802436A0 44821000 */ mtc1 $v0, $f2 -/* 7EE3B4 802436A4 00000000 */ nop -/* 7EE3B8 802436A8 468010A0 */ cvt.s.w $f2, $f2 -/* 7EE3BC 802436AC 46041082 */ mul.s $f2, $f2, $f4 -/* 7EE3C0 802436B0 00000000 */ nop -/* 7EE3C4 802436B4 4600E700 */ add.s $f28, $f28, $f0 -/* 7EE3C8 802436B8 4602D680 */ add.s $f26, $f26, $f2 -/* 7EE3CC 802436BC 0C00A8D4 */ jal cos_deg -/* 7EE3D0 802436C0 4600B306 */ mov.s $f12, $f22 -/* 7EE3D4 802436C4 46140002 */ mul.s $f0, $f0, $f20 -/* 7EE3D8 802436C8 00000000 */ nop -/* 7EE3DC 802436CC 0220202D */ daddu $a0, $s1, $zero -/* 7EE3E0 802436D0 0260282D */ daddu $a1, $s3, $zero -/* 7EE3E4 802436D4 4600E18D */ trunc.w.s $f6, $f28 -/* 7EE3E8 802436D8 44063000 */ mfc1 $a2, $f6 -/* 7EE3EC 802436DC 0C0B2026 */ jal set_variable -/* 7EE3F0 802436E0 4600C601 */ sub.s $f24, $f24, $f0 -/* 7EE3F4 802436E4 0220202D */ daddu $a0, $s1, $zero -/* 7EE3F8 802436E8 4600D18D */ trunc.w.s $f6, $f26 -/* 7EE3FC 802436EC 44063000 */ mfc1 $a2, $f6 -/* 7EE400 802436F0 0C0B2026 */ jal set_variable -/* 7EE404 802436F4 0280282D */ daddu $a1, $s4, $zero -/* 7EE408 802436F8 0220202D */ daddu $a0, $s1, $zero -/* 7EE40C 802436FC 4600C18D */ trunc.w.s $f6, $f24 -/* 7EE410 80243700 44063000 */ mfc1 $a2, $f6 -/* 7EE414 80243704 0C0B2026 */ jal set_variable -/* 7EE418 80243708 0200282D */ daddu $a1, $s0, $zero -/* 7EE41C 8024370C 8FBF0024 */ lw $ra, 0x24($sp) -/* 7EE420 80243710 8FB40020 */ lw $s4, 0x20($sp) -/* 7EE424 80243714 8FB3001C */ lw $s3, 0x1c($sp) -/* 7EE428 80243718 8FB20018 */ lw $s2, 0x18($sp) -/* 7EE42C 8024371C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EE430 80243720 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE434 80243724 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 7EE438 80243728 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 7EE43C 8024372C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 7EE440 80243730 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 7EE444 80243734 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 7EE448 80243738 24020002 */ addiu $v0, $zero, 2 -/* 7EE44C 8024373C 03E00008 */ jr $ra -/* 7EE450 80243740 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243B04.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243B04.s deleted file mode 100644 index ee1c2cf565..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243B04.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243B04 -/* 804384 80243B04 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 804388 80243B08 AFB10014 */ sw $s1, 0x14($sp) -/* 80438C 80243B0C 0080882D */ daddu $s1, $a0, $zero -/* 804390 80243B10 AFBF0024 */ sw $ra, 0x24($sp) -/* 804394 80243B14 AFB40020 */ sw $s4, 0x20($sp) -/* 804398 80243B18 AFB3001C */ sw $s3, 0x1c($sp) -/* 80439C 80243B1C AFB20018 */ sw $s2, 0x18($sp) -/* 8043A0 80243B20 AFB00010 */ sw $s0, 0x10($sp) -/* 8043A4 80243B24 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 8043A8 80243B28 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8043AC 80243B2C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8043B0 80243B30 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8043B4 80243B34 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8043B8 80243B38 8E30000C */ lw $s0, 0xc($s1) -/* 8043BC 80243B3C 8E130000 */ lw $s3, ($s0) -/* 8043C0 80243B40 26100004 */ addiu $s0, $s0, 4 -/* 8043C4 80243B44 0C0B1EAF */ jal get_variable -/* 8043C8 80243B48 0260282D */ daddu $a1, $s3, $zero -/* 8043CC 80243B4C 4482E000 */ mtc1 $v0, $f28 -/* 8043D0 80243B50 00000000 */ nop -/* 8043D4 80243B54 4680E720 */ cvt.s.w $f28, $f28 -/* 8043D8 80243B58 8E140000 */ lw $s4, ($s0) -/* 8043DC 80243B5C 26100004 */ addiu $s0, $s0, 4 -/* 8043E0 80243B60 0220202D */ daddu $a0, $s1, $zero -/* 8043E4 80243B64 0C0B1EAF */ jal get_variable -/* 8043E8 80243B68 0280282D */ daddu $a1, $s4, $zero -/* 8043EC 80243B6C 4482D000 */ mtc1 $v0, $f26 -/* 8043F0 80243B70 00000000 */ nop -/* 8043F4 80243B74 4680D6A0 */ cvt.s.w $f26, $f26 -/* 8043F8 80243B78 8E100000 */ lw $s0, ($s0) -/* 8043FC 80243B7C 0220202D */ daddu $a0, $s1, $zero -/* 804400 80243B80 0C0B1EAF */ jal get_variable -/* 804404 80243B84 0200282D */ daddu $a1, $s0, $zero -/* 804408 80243B88 4482C000 */ mtc1 $v0, $f24 -/* 80440C 80243B8C 00000000 */ nop -/* 804410 80243B90 4680C620 */ cvt.s.w $f24, $f24 -/* 804414 80243B94 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 804418 80243B98 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 80441C 80243B9C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 804420 80243BA0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 804424 80243BA4 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 804428 80243BA8 44800000 */ mtc1 $zero, $f0 -/* 80442C 80243BAC 00031080 */ sll $v0, $v1, 2 -/* 804430 80243BB0 00431021 */ addu $v0, $v0, $v1 -/* 804434 80243BB4 00021080 */ sll $v0, $v0, 2 -/* 804438 80243BB8 00431023 */ subu $v0, $v0, $v1 -/* 80443C 80243BBC 000218C0 */ sll $v1, $v0, 3 -/* 804440 80243BC0 00431021 */ addu $v0, $v0, $v1 -/* 804444 80243BC4 000210C0 */ sll $v0, $v0, 3 -/* 804448 80243BC8 46001032 */ c.eq.s $f2, $f0 -/* 80444C 80243BCC 3C01800B */ lui $at, 0x800b -/* 804450 80243BD0 00220821 */ addu $at, $at, $v0 -/* 804454 80243BD4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 804458 80243BD8 45000005 */ bc1f .L80243BF0 -/* 80445C 80243BDC 00000000 */ nop -/* 804460 80243BE0 3C0142C8 */ lui $at, 0x42c8 -/* 804464 80243BE4 44810000 */ mtc1 $at, $f0 -/* 804468 80243BE8 08090F00 */ j .L80243C00 -/* 80446C 80243BEC 4600B581 */ sub.s $f22, $f22, $f0 -.L80243BF0: -/* 804470 80243BF0 3C0142C8 */ lui $at, 0x42c8 -/* 804474 80243BF4 44810000 */ mtc1 $at, $f0 -/* 804478 80243BF8 00000000 */ nop -/* 80447C 80243BFC 4600B580 */ add.s $f22, $f22, $f0 -.L80243C00: -/* 804480 80243C00 0C00A6C9 */ jal clamp_angle -/* 804484 80243C04 4600B306 */ mov.s $f12, $f22 -/* 804488 80243C08 46000586 */ mov.s $f22, $f0 -/* 80448C 80243C0C 3C014170 */ lui $at, 0x4170 -/* 804490 80243C10 4481A000 */ mtc1 $at, $f20 -/* 804494 80243C14 0C00A8BB */ jal sin_deg -/* 804498 80243C18 4600B306 */ mov.s $f12, $f22 -/* 80449C 80243C1C 46140002 */ mul.s $f0, $f0, $f20 -/* 8044A0 80243C20 00000000 */ nop -/* 8044A4 80243C24 864200B0 */ lh $v0, 0xb0($s2) -/* 8044A8 80243C28 3C013F00 */ lui $at, 0x3f00 -/* 8044AC 80243C2C 44812000 */ mtc1 $at, $f4 -/* 8044B0 80243C30 44821000 */ mtc1 $v0, $f2 -/* 8044B4 80243C34 00000000 */ nop -/* 8044B8 80243C38 468010A0 */ cvt.s.w $f2, $f2 -/* 8044BC 80243C3C 46041082 */ mul.s $f2, $f2, $f4 -/* 8044C0 80243C40 00000000 */ nop -/* 8044C4 80243C44 4600E700 */ add.s $f28, $f28, $f0 -/* 8044C8 80243C48 4602D680 */ add.s $f26, $f26, $f2 -/* 8044CC 80243C4C 0C00A8D4 */ jal cos_deg -/* 8044D0 80243C50 4600B306 */ mov.s $f12, $f22 -/* 8044D4 80243C54 46140002 */ mul.s $f0, $f0, $f20 -/* 8044D8 80243C58 00000000 */ nop -/* 8044DC 80243C5C 0220202D */ daddu $a0, $s1, $zero -/* 8044E0 80243C60 0260282D */ daddu $a1, $s3, $zero -/* 8044E4 80243C64 4600E18D */ trunc.w.s $f6, $f28 -/* 8044E8 80243C68 44063000 */ mfc1 $a2, $f6 -/* 8044EC 80243C6C 0C0B2026 */ jal set_variable -/* 8044F0 80243C70 4600C601 */ sub.s $f24, $f24, $f0 -/* 8044F4 80243C74 0220202D */ daddu $a0, $s1, $zero -/* 8044F8 80243C78 4600D18D */ trunc.w.s $f6, $f26 -/* 8044FC 80243C7C 44063000 */ mfc1 $a2, $f6 -/* 804500 80243C80 0C0B2026 */ jal set_variable -/* 804504 80243C84 0280282D */ daddu $a1, $s4, $zero -/* 804508 80243C88 0220202D */ daddu $a0, $s1, $zero -/* 80450C 80243C8C 4600C18D */ trunc.w.s $f6, $f24 -/* 804510 80243C90 44063000 */ mfc1 $a2, $f6 -/* 804514 80243C94 0C0B2026 */ jal set_variable -/* 804518 80243C98 0200282D */ daddu $a1, $s0, $zero -/* 80451C 80243C9C 8FBF0024 */ lw $ra, 0x24($sp) -/* 804520 80243CA0 8FB40020 */ lw $s4, 0x20($sp) -/* 804524 80243CA4 8FB3001C */ lw $s3, 0x1c($sp) -/* 804528 80243CA8 8FB20018 */ lw $s2, 0x18($sp) -/* 80452C 80243CAC 8FB10014 */ lw $s1, 0x14($sp) -/* 804530 80243CB0 8FB00010 */ lw $s0, 0x10($sp) -/* 804534 80243CB4 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 804538 80243CB8 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 80453C 80243CBC D7B80038 */ ldc1 $f24, 0x38($sp) -/* 804540 80243CC0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 804544 80243CC4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 804548 80243CC8 24020002 */ addiu $v0, $zero, 2 -/* 80454C 80243CCC 03E00008 */ jr $ra -/* 804550 80243CD0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802428B0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802428B0.s deleted file mode 100644 index 06272db4ef..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802428B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428B0 -/* 825B70 802428B0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 825B74 802428B4 AFB10014 */ sw $s1, 0x14($sp) -/* 825B78 802428B8 0080882D */ daddu $s1, $a0, $zero -/* 825B7C 802428BC AFBF0024 */ sw $ra, 0x24($sp) -/* 825B80 802428C0 AFB40020 */ sw $s4, 0x20($sp) -/* 825B84 802428C4 AFB3001C */ sw $s3, 0x1c($sp) -/* 825B88 802428C8 AFB20018 */ sw $s2, 0x18($sp) -/* 825B8C 802428CC AFB00010 */ sw $s0, 0x10($sp) -/* 825B90 802428D0 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 825B94 802428D4 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 825B98 802428D8 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 825B9C 802428DC F7B60030 */ sdc1 $f22, 0x30($sp) -/* 825BA0 802428E0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 825BA4 802428E4 8E30000C */ lw $s0, 0xc($s1) -/* 825BA8 802428E8 8E130000 */ lw $s3, ($s0) -/* 825BAC 802428EC 26100004 */ addiu $s0, $s0, 4 -/* 825BB0 802428F0 0C0B1EAF */ jal get_variable -/* 825BB4 802428F4 0260282D */ daddu $a1, $s3, $zero -/* 825BB8 802428F8 4482E000 */ mtc1 $v0, $f28 -/* 825BBC 802428FC 00000000 */ nop -/* 825BC0 80242900 4680E720 */ cvt.s.w $f28, $f28 -/* 825BC4 80242904 8E140000 */ lw $s4, ($s0) -/* 825BC8 80242908 26100004 */ addiu $s0, $s0, 4 -/* 825BCC 8024290C 0220202D */ daddu $a0, $s1, $zero -/* 825BD0 80242910 0C0B1EAF */ jal get_variable -/* 825BD4 80242914 0280282D */ daddu $a1, $s4, $zero -/* 825BD8 80242918 4482D000 */ mtc1 $v0, $f26 -/* 825BDC 8024291C 00000000 */ nop -/* 825BE0 80242920 4680D6A0 */ cvt.s.w $f26, $f26 -/* 825BE4 80242924 8E100000 */ lw $s0, ($s0) -/* 825BE8 80242928 0220202D */ daddu $a0, $s1, $zero -/* 825BEC 8024292C 0C0B1EAF */ jal get_variable -/* 825BF0 80242930 0200282D */ daddu $a1, $s0, $zero -/* 825BF4 80242934 4482C000 */ mtc1 $v0, $f24 -/* 825BF8 80242938 00000000 */ nop -/* 825BFC 8024293C 4680C620 */ cvt.s.w $f24, $f24 -/* 825C00 80242940 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 825C04 80242944 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 825C08 80242948 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 825C0C 8024294C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 825C10 80242950 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 825C14 80242954 44800000 */ mtc1 $zero, $f0 -/* 825C18 80242958 00031080 */ sll $v0, $v1, 2 -/* 825C1C 8024295C 00431021 */ addu $v0, $v0, $v1 -/* 825C20 80242960 00021080 */ sll $v0, $v0, 2 -/* 825C24 80242964 00431023 */ subu $v0, $v0, $v1 -/* 825C28 80242968 000218C0 */ sll $v1, $v0, 3 -/* 825C2C 8024296C 00431021 */ addu $v0, $v0, $v1 -/* 825C30 80242970 000210C0 */ sll $v0, $v0, 3 -/* 825C34 80242974 46001032 */ c.eq.s $f2, $f0 -/* 825C38 80242978 3C01800B */ lui $at, 0x800b -/* 825C3C 8024297C 00220821 */ addu $at, $at, $v0 -/* 825C40 80242980 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 825C44 80242984 45000005 */ bc1f .L8024299C -/* 825C48 80242988 00000000 */ nop -/* 825C4C 8024298C 3C0142C8 */ lui $at, 0x42c8 -/* 825C50 80242990 44810000 */ mtc1 $at, $f0 -/* 825C54 80242994 08090A6B */ j .L802429AC -/* 825C58 80242998 4600B581 */ sub.s $f22, $f22, $f0 -.L8024299C: -/* 825C5C 8024299C 3C0142C8 */ lui $at, 0x42c8 -/* 825C60 802429A0 44810000 */ mtc1 $at, $f0 -/* 825C64 802429A4 00000000 */ nop -/* 825C68 802429A8 4600B580 */ add.s $f22, $f22, $f0 -.L802429AC: -/* 825C6C 802429AC 0C00A6C9 */ jal clamp_angle -/* 825C70 802429B0 4600B306 */ mov.s $f12, $f22 -/* 825C74 802429B4 46000586 */ mov.s $f22, $f0 -/* 825C78 802429B8 3C014170 */ lui $at, 0x4170 -/* 825C7C 802429BC 4481A000 */ mtc1 $at, $f20 -/* 825C80 802429C0 0C00A8BB */ jal sin_deg -/* 825C84 802429C4 4600B306 */ mov.s $f12, $f22 -/* 825C88 802429C8 46140002 */ mul.s $f0, $f0, $f20 -/* 825C8C 802429CC 00000000 */ nop -/* 825C90 802429D0 864200B0 */ lh $v0, 0xb0($s2) -/* 825C94 802429D4 3C013F00 */ lui $at, 0x3f00 -/* 825C98 802429D8 44812000 */ mtc1 $at, $f4 -/* 825C9C 802429DC 44821000 */ mtc1 $v0, $f2 -/* 825CA0 802429E0 00000000 */ nop -/* 825CA4 802429E4 468010A0 */ cvt.s.w $f2, $f2 -/* 825CA8 802429E8 46041082 */ mul.s $f2, $f2, $f4 -/* 825CAC 802429EC 00000000 */ nop -/* 825CB0 802429F0 4600E700 */ add.s $f28, $f28, $f0 -/* 825CB4 802429F4 4602D680 */ add.s $f26, $f26, $f2 -/* 825CB8 802429F8 0C00A8D4 */ jal cos_deg -/* 825CBC 802429FC 4600B306 */ mov.s $f12, $f22 -/* 825CC0 80242A00 46140002 */ mul.s $f0, $f0, $f20 -/* 825CC4 80242A04 00000000 */ nop -/* 825CC8 80242A08 0220202D */ daddu $a0, $s1, $zero -/* 825CCC 80242A0C 0260282D */ daddu $a1, $s3, $zero -/* 825CD0 80242A10 4600E18D */ trunc.w.s $f6, $f28 -/* 825CD4 80242A14 44063000 */ mfc1 $a2, $f6 -/* 825CD8 80242A18 0C0B2026 */ jal set_variable -/* 825CDC 80242A1C 4600C601 */ sub.s $f24, $f24, $f0 -/* 825CE0 80242A20 0220202D */ daddu $a0, $s1, $zero -/* 825CE4 80242A24 4600D18D */ trunc.w.s $f6, $f26 -/* 825CE8 80242A28 44063000 */ mfc1 $a2, $f6 -/* 825CEC 80242A2C 0C0B2026 */ jal set_variable -/* 825CF0 80242A30 0280282D */ daddu $a1, $s4, $zero -/* 825CF4 80242A34 0220202D */ daddu $a0, $s1, $zero -/* 825CF8 80242A38 4600C18D */ trunc.w.s $f6, $f24 -/* 825CFC 80242A3C 44063000 */ mfc1 $a2, $f6 -/* 825D00 80242A40 0C0B2026 */ jal set_variable -/* 825D04 80242A44 0200282D */ daddu $a1, $s0, $zero -/* 825D08 80242A48 8FBF0024 */ lw $ra, 0x24($sp) -/* 825D0C 80242A4C 8FB40020 */ lw $s4, 0x20($sp) -/* 825D10 80242A50 8FB3001C */ lw $s3, 0x1c($sp) -/* 825D14 80242A54 8FB20018 */ lw $s2, 0x18($sp) -/* 825D18 80242A58 8FB10014 */ lw $s1, 0x14($sp) -/* 825D1C 80242A5C 8FB00010 */ lw $s0, 0x10($sp) -/* 825D20 80242A60 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 825D24 80242A64 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 825D28 80242A68 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 825D2C 80242A6C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 825D30 80242A70 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 825D34 80242A74 24020002 */ addiu $v0, $zero, 2 -/* 825D38 80242A78 03E00008 */ jr $ra -/* 825D3C 80242A7C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802415A0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802415A0.s deleted file mode 100644 index ea67f3a752..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802415A0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415A0 -/* 832DA0 802415A0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 832DA4 802415A4 AFB10014 */ sw $s1, 0x14($sp) -/* 832DA8 802415A8 0080882D */ daddu $s1, $a0, $zero -/* 832DAC 802415AC AFBF0024 */ sw $ra, 0x24($sp) -/* 832DB0 802415B0 AFB40020 */ sw $s4, 0x20($sp) -/* 832DB4 802415B4 AFB3001C */ sw $s3, 0x1c($sp) -/* 832DB8 802415B8 AFB20018 */ sw $s2, 0x18($sp) -/* 832DBC 802415BC AFB00010 */ sw $s0, 0x10($sp) -/* 832DC0 802415C0 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 832DC4 802415C4 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 832DC8 802415C8 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 832DCC 802415CC F7B60030 */ sdc1 $f22, 0x30($sp) -/* 832DD0 802415D0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 832DD4 802415D4 8E30000C */ lw $s0, 0xc($s1) -/* 832DD8 802415D8 8E130000 */ lw $s3, ($s0) -/* 832DDC 802415DC 26100004 */ addiu $s0, $s0, 4 -/* 832DE0 802415E0 0C0B1EAF */ jal get_variable -/* 832DE4 802415E4 0260282D */ daddu $a1, $s3, $zero -/* 832DE8 802415E8 4482E000 */ mtc1 $v0, $f28 -/* 832DEC 802415EC 00000000 */ nop -/* 832DF0 802415F0 4680E720 */ cvt.s.w $f28, $f28 -/* 832DF4 802415F4 8E140000 */ lw $s4, ($s0) -/* 832DF8 802415F8 26100004 */ addiu $s0, $s0, 4 -/* 832DFC 802415FC 0220202D */ daddu $a0, $s1, $zero -/* 832E00 80241600 0C0B1EAF */ jal get_variable -/* 832E04 80241604 0280282D */ daddu $a1, $s4, $zero -/* 832E08 80241608 4482D000 */ mtc1 $v0, $f26 -/* 832E0C 8024160C 00000000 */ nop -/* 832E10 80241610 4680D6A0 */ cvt.s.w $f26, $f26 -/* 832E14 80241614 8E100000 */ lw $s0, ($s0) -/* 832E18 80241618 0220202D */ daddu $a0, $s1, $zero -/* 832E1C 8024161C 0C0B1EAF */ jal get_variable -/* 832E20 80241620 0200282D */ daddu $a1, $s0, $zero -/* 832E24 80241624 4482C000 */ mtc1 $v0, $f24 -/* 832E28 80241628 00000000 */ nop -/* 832E2C 8024162C 4680C620 */ cvt.s.w $f24, $f24 -/* 832E30 80241630 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 832E34 80241634 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 832E38 80241638 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 832E3C 8024163C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 832E40 80241640 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 832E44 80241644 44800000 */ mtc1 $zero, $f0 -/* 832E48 80241648 00031080 */ sll $v0, $v1, 2 -/* 832E4C 8024164C 00431021 */ addu $v0, $v0, $v1 -/* 832E50 80241650 00021080 */ sll $v0, $v0, 2 -/* 832E54 80241654 00431023 */ subu $v0, $v0, $v1 -/* 832E58 80241658 000218C0 */ sll $v1, $v0, 3 -/* 832E5C 8024165C 00431021 */ addu $v0, $v0, $v1 -/* 832E60 80241660 000210C0 */ sll $v0, $v0, 3 -/* 832E64 80241664 46001032 */ c.eq.s $f2, $f0 -/* 832E68 80241668 3C01800B */ lui $at, 0x800b -/* 832E6C 8024166C 00220821 */ addu $at, $at, $v0 -/* 832E70 80241670 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 832E74 80241674 45000005 */ bc1f .L8024168C -/* 832E78 80241678 00000000 */ nop -/* 832E7C 8024167C 3C0142C8 */ lui $at, 0x42c8 -/* 832E80 80241680 44810000 */ mtc1 $at, $f0 -/* 832E84 80241684 080905A7 */ j .L8024169C -/* 832E88 80241688 4600B581 */ sub.s $f22, $f22, $f0 -.L8024168C: -/* 832E8C 8024168C 3C0142C8 */ lui $at, 0x42c8 -/* 832E90 80241690 44810000 */ mtc1 $at, $f0 -/* 832E94 80241694 00000000 */ nop -/* 832E98 80241698 4600B580 */ add.s $f22, $f22, $f0 -.L8024169C: -/* 832E9C 8024169C 0C00A6C9 */ jal clamp_angle -/* 832EA0 802416A0 4600B306 */ mov.s $f12, $f22 -/* 832EA4 802416A4 46000586 */ mov.s $f22, $f0 -/* 832EA8 802416A8 3C014170 */ lui $at, 0x4170 -/* 832EAC 802416AC 4481A000 */ mtc1 $at, $f20 -/* 832EB0 802416B0 0C00A8BB */ jal sin_deg -/* 832EB4 802416B4 4600B306 */ mov.s $f12, $f22 -/* 832EB8 802416B8 46140002 */ mul.s $f0, $f0, $f20 -/* 832EBC 802416BC 00000000 */ nop -/* 832EC0 802416C0 864200B0 */ lh $v0, 0xb0($s2) -/* 832EC4 802416C4 3C013F00 */ lui $at, 0x3f00 -/* 832EC8 802416C8 44812000 */ mtc1 $at, $f4 -/* 832ECC 802416CC 44821000 */ mtc1 $v0, $f2 -/* 832ED0 802416D0 00000000 */ nop -/* 832ED4 802416D4 468010A0 */ cvt.s.w $f2, $f2 -/* 832ED8 802416D8 46041082 */ mul.s $f2, $f2, $f4 -/* 832EDC 802416DC 00000000 */ nop -/* 832EE0 802416E0 4600E700 */ add.s $f28, $f28, $f0 -/* 832EE4 802416E4 4602D680 */ add.s $f26, $f26, $f2 -/* 832EE8 802416E8 0C00A8D4 */ jal cos_deg -/* 832EEC 802416EC 4600B306 */ mov.s $f12, $f22 -/* 832EF0 802416F0 46140002 */ mul.s $f0, $f0, $f20 -/* 832EF4 802416F4 00000000 */ nop -/* 832EF8 802416F8 0220202D */ daddu $a0, $s1, $zero -/* 832EFC 802416FC 0260282D */ daddu $a1, $s3, $zero -/* 832F00 80241700 4600E18D */ trunc.w.s $f6, $f28 -/* 832F04 80241704 44063000 */ mfc1 $a2, $f6 -/* 832F08 80241708 0C0B2026 */ jal set_variable -/* 832F0C 8024170C 4600C601 */ sub.s $f24, $f24, $f0 -/* 832F10 80241710 0220202D */ daddu $a0, $s1, $zero -/* 832F14 80241714 4600D18D */ trunc.w.s $f6, $f26 -/* 832F18 80241718 44063000 */ mfc1 $a2, $f6 -/* 832F1C 8024171C 0C0B2026 */ jal set_variable -/* 832F20 80241720 0280282D */ daddu $a1, $s4, $zero -/* 832F24 80241724 0220202D */ daddu $a0, $s1, $zero -/* 832F28 80241728 4600C18D */ trunc.w.s $f6, $f24 -/* 832F2C 8024172C 44063000 */ mfc1 $a2, $f6 -/* 832F30 80241730 0C0B2026 */ jal set_variable -/* 832F34 80241734 0200282D */ daddu $a1, $s0, $zero -/* 832F38 80241738 8FBF0024 */ lw $ra, 0x24($sp) -/* 832F3C 8024173C 8FB40020 */ lw $s4, 0x20($sp) -/* 832F40 80241740 8FB3001C */ lw $s3, 0x1c($sp) -/* 832F44 80241744 8FB20018 */ lw $s2, 0x18($sp) -/* 832F48 80241748 8FB10014 */ lw $s1, 0x14($sp) -/* 832F4C 8024174C 8FB00010 */ lw $s0, 0x10($sp) -/* 832F50 80241750 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 832F54 80241754 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 832F58 80241758 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 832F5C 8024175C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 832F60 80241760 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 832F64 80241764 24020002 */ addiu $v0, $zero, 2 -/* 832F68 80241768 03E00008 */ jr $ra -/* 832F6C 8024176C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241550.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241550.s deleted file mode 100644 index f8e5a44f60..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241550.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241550 -/* 844120 80241550 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 844124 80241554 AFB10014 */ sw $s1, 0x14($sp) -/* 844128 80241558 0080882D */ daddu $s1, $a0, $zero -/* 84412C 8024155C AFBF0024 */ sw $ra, 0x24($sp) -/* 844130 80241560 AFB40020 */ sw $s4, 0x20($sp) -/* 844134 80241564 AFB3001C */ sw $s3, 0x1c($sp) -/* 844138 80241568 AFB20018 */ sw $s2, 0x18($sp) -/* 84413C 8024156C AFB00010 */ sw $s0, 0x10($sp) -/* 844140 80241570 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 844144 80241574 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 844148 80241578 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 84414C 8024157C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 844150 80241580 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 844154 80241584 8E30000C */ lw $s0, 0xc($s1) -/* 844158 80241588 8E130000 */ lw $s3, ($s0) -/* 84415C 8024158C 26100004 */ addiu $s0, $s0, 4 -/* 844160 80241590 0C0B1EAF */ jal get_variable -/* 844164 80241594 0260282D */ daddu $a1, $s3, $zero -/* 844168 80241598 4482E000 */ mtc1 $v0, $f28 -/* 84416C 8024159C 00000000 */ nop -/* 844170 802415A0 4680E720 */ cvt.s.w $f28, $f28 -/* 844174 802415A4 8E140000 */ lw $s4, ($s0) -/* 844178 802415A8 26100004 */ addiu $s0, $s0, 4 -/* 84417C 802415AC 0220202D */ daddu $a0, $s1, $zero -/* 844180 802415B0 0C0B1EAF */ jal get_variable -/* 844184 802415B4 0280282D */ daddu $a1, $s4, $zero -/* 844188 802415B8 4482D000 */ mtc1 $v0, $f26 -/* 84418C 802415BC 00000000 */ nop -/* 844190 802415C0 4680D6A0 */ cvt.s.w $f26, $f26 -/* 844194 802415C4 8E100000 */ lw $s0, ($s0) -/* 844198 802415C8 0220202D */ daddu $a0, $s1, $zero -/* 84419C 802415CC 0C0B1EAF */ jal get_variable -/* 8441A0 802415D0 0200282D */ daddu $a1, $s0, $zero -/* 8441A4 802415D4 4482C000 */ mtc1 $v0, $f24 -/* 8441A8 802415D8 00000000 */ nop -/* 8441AC 802415DC 4680C620 */ cvt.s.w $f24, $f24 -/* 8441B0 802415E0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 8441B4 802415E4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 8441B8 802415E8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8441BC 802415EC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8441C0 802415F0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 8441C4 802415F4 44800000 */ mtc1 $zero, $f0 -/* 8441C8 802415F8 00031080 */ sll $v0, $v1, 2 -/* 8441CC 802415FC 00431021 */ addu $v0, $v0, $v1 -/* 8441D0 80241600 00021080 */ sll $v0, $v0, 2 -/* 8441D4 80241604 00431023 */ subu $v0, $v0, $v1 -/* 8441D8 80241608 000218C0 */ sll $v1, $v0, 3 -/* 8441DC 8024160C 00431021 */ addu $v0, $v0, $v1 -/* 8441E0 80241610 000210C0 */ sll $v0, $v0, 3 -/* 8441E4 80241614 46001032 */ c.eq.s $f2, $f0 -/* 8441E8 80241618 3C01800B */ lui $at, 0x800b -/* 8441EC 8024161C 00220821 */ addu $at, $at, $v0 -/* 8441F0 80241620 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 8441F4 80241624 45000005 */ bc1f .L8024163C -/* 8441F8 80241628 00000000 */ nop -/* 8441FC 8024162C 3C0142C8 */ lui $at, 0x42c8 -/* 844200 80241630 44810000 */ mtc1 $at, $f0 -/* 844204 80241634 08090593 */ j .L8024164C -/* 844208 80241638 4600B581 */ sub.s $f22, $f22, $f0 -.L8024163C: -/* 84420C 8024163C 3C0142C8 */ lui $at, 0x42c8 -/* 844210 80241640 44810000 */ mtc1 $at, $f0 -/* 844214 80241644 00000000 */ nop -/* 844218 80241648 4600B580 */ add.s $f22, $f22, $f0 -.L8024164C: -/* 84421C 8024164C 0C00A6C9 */ jal clamp_angle -/* 844220 80241650 4600B306 */ mov.s $f12, $f22 -/* 844224 80241654 46000586 */ mov.s $f22, $f0 -/* 844228 80241658 3C014170 */ lui $at, 0x4170 -/* 84422C 8024165C 4481A000 */ mtc1 $at, $f20 -/* 844230 80241660 0C00A8BB */ jal sin_deg -/* 844234 80241664 4600B306 */ mov.s $f12, $f22 -/* 844238 80241668 46140002 */ mul.s $f0, $f0, $f20 -/* 84423C 8024166C 00000000 */ nop -/* 844240 80241670 864200B0 */ lh $v0, 0xb0($s2) -/* 844244 80241674 3C013F00 */ lui $at, 0x3f00 -/* 844248 80241678 44812000 */ mtc1 $at, $f4 -/* 84424C 8024167C 44821000 */ mtc1 $v0, $f2 -/* 844250 80241680 00000000 */ nop -/* 844254 80241684 468010A0 */ cvt.s.w $f2, $f2 -/* 844258 80241688 46041082 */ mul.s $f2, $f2, $f4 -/* 84425C 8024168C 00000000 */ nop -/* 844260 80241690 4600E700 */ add.s $f28, $f28, $f0 -/* 844264 80241694 4602D680 */ add.s $f26, $f26, $f2 -/* 844268 80241698 0C00A8D4 */ jal cos_deg -/* 84426C 8024169C 4600B306 */ mov.s $f12, $f22 -/* 844270 802416A0 46140002 */ mul.s $f0, $f0, $f20 -/* 844274 802416A4 00000000 */ nop -/* 844278 802416A8 0220202D */ daddu $a0, $s1, $zero -/* 84427C 802416AC 0260282D */ daddu $a1, $s3, $zero -/* 844280 802416B0 4600E18D */ trunc.w.s $f6, $f28 -/* 844284 802416B4 44063000 */ mfc1 $a2, $f6 -/* 844288 802416B8 0C0B2026 */ jal set_variable -/* 84428C 802416BC 4600C601 */ sub.s $f24, $f24, $f0 -/* 844290 802416C0 0220202D */ daddu $a0, $s1, $zero -/* 844294 802416C4 4600D18D */ trunc.w.s $f6, $f26 -/* 844298 802416C8 44063000 */ mfc1 $a2, $f6 -/* 84429C 802416CC 0C0B2026 */ jal set_variable -/* 8442A0 802416D0 0280282D */ daddu $a1, $s4, $zero -/* 8442A4 802416D4 0220202D */ daddu $a0, $s1, $zero -/* 8442A8 802416D8 4600C18D */ trunc.w.s $f6, $f24 -/* 8442AC 802416DC 44063000 */ mfc1 $a2, $f6 -/* 8442B0 802416E0 0C0B2026 */ jal set_variable -/* 8442B4 802416E4 0200282D */ daddu $a1, $s0, $zero -/* 8442B8 802416E8 8FBF0024 */ lw $ra, 0x24($sp) -/* 8442BC 802416EC 8FB40020 */ lw $s4, 0x20($sp) -/* 8442C0 802416F0 8FB3001C */ lw $s3, 0x1c($sp) -/* 8442C4 802416F4 8FB20018 */ lw $s2, 0x18($sp) -/* 8442C8 802416F8 8FB10014 */ lw $s1, 0x14($sp) -/* 8442CC 802416FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8442D0 80241700 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 8442D4 80241704 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8442D8 80241708 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8442DC 8024170C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8442E0 80241710 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8442E4 80241714 24020002 */ addiu $v0, $zero, 2 -/* 8442E8 80241718 03E00008 */ jr $ra -/* 8442EC 8024171C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242410.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242410.s deleted file mode 100644 index 5b5e07e83f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242410.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242410 -/* 854580 80242410 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 854584 80242414 AFB10014 */ sw $s1, 0x14($sp) -/* 854588 80242418 0080882D */ daddu $s1, $a0, $zero -/* 85458C 8024241C AFBF0024 */ sw $ra, 0x24($sp) -/* 854590 80242420 AFB40020 */ sw $s4, 0x20($sp) -/* 854594 80242424 AFB3001C */ sw $s3, 0x1c($sp) -/* 854598 80242428 AFB20018 */ sw $s2, 0x18($sp) -/* 85459C 8024242C AFB00010 */ sw $s0, 0x10($sp) -/* 8545A0 80242430 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 8545A4 80242434 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8545A8 80242438 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8545AC 8024243C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8545B0 80242440 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8545B4 80242444 8E30000C */ lw $s0, 0xc($s1) -/* 8545B8 80242448 8E130000 */ lw $s3, ($s0) -/* 8545BC 8024244C 26100004 */ addiu $s0, $s0, 4 -/* 8545C0 80242450 0C0B1EAF */ jal get_variable -/* 8545C4 80242454 0260282D */ daddu $a1, $s3, $zero -/* 8545C8 80242458 4482E000 */ mtc1 $v0, $f28 -/* 8545CC 8024245C 00000000 */ nop -/* 8545D0 80242460 4680E720 */ cvt.s.w $f28, $f28 -/* 8545D4 80242464 8E140000 */ lw $s4, ($s0) -/* 8545D8 80242468 26100004 */ addiu $s0, $s0, 4 -/* 8545DC 8024246C 0220202D */ daddu $a0, $s1, $zero -/* 8545E0 80242470 0C0B1EAF */ jal get_variable -/* 8545E4 80242474 0280282D */ daddu $a1, $s4, $zero -/* 8545E8 80242478 4482D000 */ mtc1 $v0, $f26 -/* 8545EC 8024247C 00000000 */ nop -/* 8545F0 80242480 4680D6A0 */ cvt.s.w $f26, $f26 -/* 8545F4 80242484 8E100000 */ lw $s0, ($s0) -/* 8545F8 80242488 0220202D */ daddu $a0, $s1, $zero -/* 8545FC 8024248C 0C0B1EAF */ jal get_variable -/* 854600 80242490 0200282D */ daddu $a1, $s0, $zero -/* 854604 80242494 4482C000 */ mtc1 $v0, $f24 -/* 854608 80242498 00000000 */ nop -/* 85460C 8024249C 4680C620 */ cvt.s.w $f24, $f24 -/* 854610 802424A0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 854614 802424A4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 854618 802424A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 85461C 802424AC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 854620 802424B0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 854624 802424B4 44800000 */ mtc1 $zero, $f0 -/* 854628 802424B8 00031080 */ sll $v0, $v1, 2 -/* 85462C 802424BC 00431021 */ addu $v0, $v0, $v1 -/* 854630 802424C0 00021080 */ sll $v0, $v0, 2 -/* 854634 802424C4 00431023 */ subu $v0, $v0, $v1 -/* 854638 802424C8 000218C0 */ sll $v1, $v0, 3 -/* 85463C 802424CC 00431021 */ addu $v0, $v0, $v1 -/* 854640 802424D0 000210C0 */ sll $v0, $v0, 3 -/* 854644 802424D4 46001032 */ c.eq.s $f2, $f0 -/* 854648 802424D8 3C01800B */ lui $at, 0x800b -/* 85464C 802424DC 00220821 */ addu $at, $at, $v0 -/* 854650 802424E0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 854654 802424E4 45000005 */ bc1f .L802424FC -/* 854658 802424E8 00000000 */ nop -/* 85465C 802424EC 3C0142C8 */ lui $at, 0x42c8 -/* 854660 802424F0 44810000 */ mtc1 $at, $f0 -/* 854664 802424F4 08090943 */ j .L8024250C -/* 854668 802424F8 4600B581 */ sub.s $f22, $f22, $f0 -.L802424FC: -/* 85466C 802424FC 3C0142C8 */ lui $at, 0x42c8 -/* 854670 80242500 44810000 */ mtc1 $at, $f0 -/* 854674 80242504 00000000 */ nop -/* 854678 80242508 4600B580 */ add.s $f22, $f22, $f0 -.L8024250C: -/* 85467C 8024250C 0C00A6C9 */ jal clamp_angle -/* 854680 80242510 4600B306 */ mov.s $f12, $f22 -/* 854684 80242514 46000586 */ mov.s $f22, $f0 -/* 854688 80242518 3C014170 */ lui $at, 0x4170 -/* 85468C 8024251C 4481A000 */ mtc1 $at, $f20 -/* 854690 80242520 0C00A8BB */ jal sin_deg -/* 854694 80242524 4600B306 */ mov.s $f12, $f22 -/* 854698 80242528 46140002 */ mul.s $f0, $f0, $f20 -/* 85469C 8024252C 00000000 */ nop -/* 8546A0 80242530 864200B0 */ lh $v0, 0xb0($s2) -/* 8546A4 80242534 3C013F00 */ lui $at, 0x3f00 -/* 8546A8 80242538 44812000 */ mtc1 $at, $f4 -/* 8546AC 8024253C 44821000 */ mtc1 $v0, $f2 -/* 8546B0 80242540 00000000 */ nop -/* 8546B4 80242544 468010A0 */ cvt.s.w $f2, $f2 -/* 8546B8 80242548 46041082 */ mul.s $f2, $f2, $f4 -/* 8546BC 8024254C 00000000 */ nop -/* 8546C0 80242550 4600E700 */ add.s $f28, $f28, $f0 -/* 8546C4 80242554 4602D680 */ add.s $f26, $f26, $f2 -/* 8546C8 80242558 0C00A8D4 */ jal cos_deg -/* 8546CC 8024255C 4600B306 */ mov.s $f12, $f22 -/* 8546D0 80242560 46140002 */ mul.s $f0, $f0, $f20 -/* 8546D4 80242564 00000000 */ nop -/* 8546D8 80242568 0220202D */ daddu $a0, $s1, $zero -/* 8546DC 8024256C 0260282D */ daddu $a1, $s3, $zero -/* 8546E0 80242570 4600E18D */ trunc.w.s $f6, $f28 -/* 8546E4 80242574 44063000 */ mfc1 $a2, $f6 -/* 8546E8 80242578 0C0B2026 */ jal set_variable -/* 8546EC 8024257C 4600C601 */ sub.s $f24, $f24, $f0 -/* 8546F0 80242580 0220202D */ daddu $a0, $s1, $zero -/* 8546F4 80242584 4600D18D */ trunc.w.s $f6, $f26 -/* 8546F8 80242588 44063000 */ mfc1 $a2, $f6 -/* 8546FC 8024258C 0C0B2026 */ jal set_variable -/* 854700 80242590 0280282D */ daddu $a1, $s4, $zero -/* 854704 80242594 0220202D */ daddu $a0, $s1, $zero -/* 854708 80242598 4600C18D */ trunc.w.s $f6, $f24 -/* 85470C 8024259C 44063000 */ mfc1 $a2, $f6 -/* 854710 802425A0 0C0B2026 */ jal set_variable -/* 854714 802425A4 0200282D */ daddu $a1, $s0, $zero -/* 854718 802425A8 8FBF0024 */ lw $ra, 0x24($sp) -/* 85471C 802425AC 8FB40020 */ lw $s4, 0x20($sp) -/* 854720 802425B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 854724 802425B4 8FB20018 */ lw $s2, 0x18($sp) -/* 854728 802425B8 8FB10014 */ lw $s1, 0x14($sp) -/* 85472C 802425BC 8FB00010 */ lw $s0, 0x10($sp) -/* 854730 802425C0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 854734 802425C4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 854738 802425C8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 85473C 802425CC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 854740 802425D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 854744 802425D4 24020002 */ addiu $v0, $zero, 2 -/* 854748 802425D8 03E00008 */ jr $ra -/* 85474C 802425DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240EE0_B98AE0.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240EE0_B98AE0.s deleted file mode 100644 index 729972795a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240EE0_B98AE0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE0_B98AE0 -/* B98AE0 80240EE0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B98AE4 80240EE4 AFB10014 */ sw $s1, 0x14($sp) -/* B98AE8 80240EE8 0080882D */ daddu $s1, $a0, $zero -/* B98AEC 80240EEC AFBF0024 */ sw $ra, 0x24($sp) -/* B98AF0 80240EF0 AFB40020 */ sw $s4, 0x20($sp) -/* B98AF4 80240EF4 AFB3001C */ sw $s3, 0x1c($sp) -/* B98AF8 80240EF8 AFB20018 */ sw $s2, 0x18($sp) -/* B98AFC 80240EFC AFB00010 */ sw $s0, 0x10($sp) -/* B98B00 80240F00 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* B98B04 80240F04 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* B98B08 80240F08 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B98B0C 80240F0C F7B60030 */ sdc1 $f22, 0x30($sp) -/* B98B10 80240F10 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B98B14 80240F14 8E30000C */ lw $s0, 0xc($s1) -/* B98B18 80240F18 8E130000 */ lw $s3, ($s0) -/* B98B1C 80240F1C 26100004 */ addiu $s0, $s0, 4 -/* B98B20 80240F20 0C0B1EAF */ jal get_variable -/* B98B24 80240F24 0260282D */ daddu $a1, $s3, $zero -/* B98B28 80240F28 4482E000 */ mtc1 $v0, $f28 -/* B98B2C 80240F2C 00000000 */ nop -/* B98B30 80240F30 4680E720 */ cvt.s.w $f28, $f28 -/* B98B34 80240F34 8E140000 */ lw $s4, ($s0) -/* B98B38 80240F38 26100004 */ addiu $s0, $s0, 4 -/* B98B3C 80240F3C 0220202D */ daddu $a0, $s1, $zero -/* B98B40 80240F40 0C0B1EAF */ jal get_variable -/* B98B44 80240F44 0280282D */ daddu $a1, $s4, $zero -/* B98B48 80240F48 4482D000 */ mtc1 $v0, $f26 -/* B98B4C 80240F4C 00000000 */ nop -/* B98B50 80240F50 4680D6A0 */ cvt.s.w $f26, $f26 -/* B98B54 80240F54 8E100000 */ lw $s0, ($s0) -/* B98B58 80240F58 0220202D */ daddu $a0, $s1, $zero -/* B98B5C 80240F5C 0C0B1EAF */ jal get_variable -/* B98B60 80240F60 0200282D */ daddu $a1, $s0, $zero -/* B98B64 80240F64 4482C000 */ mtc1 $v0, $f24 -/* B98B68 80240F68 00000000 */ nop -/* B98B6C 80240F6C 4680C620 */ cvt.s.w $f24, $f24 -/* B98B70 80240F70 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* B98B74 80240F74 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* B98B78 80240F78 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B98B7C 80240F7C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B98B80 80240F80 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* B98B84 80240F84 44800000 */ mtc1 $zero, $f0 -/* B98B88 80240F88 00031080 */ sll $v0, $v1, 2 -/* B98B8C 80240F8C 00431021 */ addu $v0, $v0, $v1 -/* B98B90 80240F90 00021080 */ sll $v0, $v0, 2 -/* B98B94 80240F94 00431023 */ subu $v0, $v0, $v1 -/* B98B98 80240F98 000218C0 */ sll $v1, $v0, 3 -/* B98B9C 80240F9C 00431021 */ addu $v0, $v0, $v1 -/* B98BA0 80240FA0 000210C0 */ sll $v0, $v0, 3 -/* B98BA4 80240FA4 46001032 */ c.eq.s $f2, $f0 -/* B98BA8 80240FA8 3C01800B */ lui $at, 0x800b -/* B98BAC 80240FAC 00220821 */ addu $at, $at, $v0 -/* B98BB0 80240FB0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B98BB4 80240FB4 45000005 */ bc1f .L80240FCC -/* B98BB8 80240FB8 00000000 */ nop -/* B98BBC 80240FBC 3C0142C8 */ lui $at, 0x42c8 -/* B98BC0 80240FC0 44810000 */ mtc1 $at, $f0 -/* B98BC4 80240FC4 080903F7 */ j .L80240FDC -/* B98BC8 80240FC8 4600B581 */ sub.s $f22, $f22, $f0 -.L80240FCC: -/* B98BCC 80240FCC 3C0142C8 */ lui $at, 0x42c8 -/* B98BD0 80240FD0 44810000 */ mtc1 $at, $f0 -/* B98BD4 80240FD4 00000000 */ nop -/* B98BD8 80240FD8 4600B580 */ add.s $f22, $f22, $f0 -.L80240FDC: -/* B98BDC 80240FDC 0C00A6C9 */ jal clamp_angle -/* B98BE0 80240FE0 4600B306 */ mov.s $f12, $f22 -/* B98BE4 80240FE4 46000586 */ mov.s $f22, $f0 -/* B98BE8 80240FE8 3C014170 */ lui $at, 0x4170 -/* B98BEC 80240FEC 4481A000 */ mtc1 $at, $f20 -/* B98BF0 80240FF0 0C00A8BB */ jal sin_deg -/* B98BF4 80240FF4 4600B306 */ mov.s $f12, $f22 -/* B98BF8 80240FF8 46140002 */ mul.s $f0, $f0, $f20 -/* B98BFC 80240FFC 00000000 */ nop -/* B98C00 80241000 864200B0 */ lh $v0, 0xb0($s2) -/* B98C04 80241004 3C013F00 */ lui $at, 0x3f00 -/* B98C08 80241008 44812000 */ mtc1 $at, $f4 -/* B98C0C 8024100C 44821000 */ mtc1 $v0, $f2 -/* B98C10 80241010 00000000 */ nop -/* B98C14 80241014 468010A0 */ cvt.s.w $f2, $f2 -/* B98C18 80241018 46041082 */ mul.s $f2, $f2, $f4 -/* B98C1C 8024101C 00000000 */ nop -/* B98C20 80241020 4600E700 */ add.s $f28, $f28, $f0 -/* B98C24 80241024 4602D680 */ add.s $f26, $f26, $f2 -/* B98C28 80241028 0C00A8D4 */ jal cos_deg -/* B98C2C 8024102C 4600B306 */ mov.s $f12, $f22 -/* B98C30 80241030 46140002 */ mul.s $f0, $f0, $f20 -/* B98C34 80241034 00000000 */ nop -/* B98C38 80241038 0220202D */ daddu $a0, $s1, $zero -/* B98C3C 8024103C 0260282D */ daddu $a1, $s3, $zero -/* B98C40 80241040 4600E18D */ trunc.w.s $f6, $f28 -/* B98C44 80241044 44063000 */ mfc1 $a2, $f6 -/* B98C48 80241048 0C0B2026 */ jal set_variable -/* B98C4C 8024104C 4600C601 */ sub.s $f24, $f24, $f0 -/* B98C50 80241050 0220202D */ daddu $a0, $s1, $zero -/* B98C54 80241054 4600D18D */ trunc.w.s $f6, $f26 -/* B98C58 80241058 44063000 */ mfc1 $a2, $f6 -/* B98C5C 8024105C 0C0B2026 */ jal set_variable -/* B98C60 80241060 0280282D */ daddu $a1, $s4, $zero -/* B98C64 80241064 0220202D */ daddu $a0, $s1, $zero -/* B98C68 80241068 4600C18D */ trunc.w.s $f6, $f24 -/* B98C6C 8024106C 44063000 */ mfc1 $a2, $f6 -/* B98C70 80241070 0C0B2026 */ jal set_variable -/* B98C74 80241074 0200282D */ daddu $a1, $s0, $zero -/* B98C78 80241078 8FBF0024 */ lw $ra, 0x24($sp) -/* B98C7C 8024107C 8FB40020 */ lw $s4, 0x20($sp) -/* B98C80 80241080 8FB3001C */ lw $s3, 0x1c($sp) -/* B98C84 80241084 8FB20018 */ lw $s2, 0x18($sp) -/* B98C88 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* B98C8C 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* B98C90 80241090 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* B98C94 80241094 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* B98C98 80241098 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B98C9C 8024109C D7B60030 */ ldc1 $f22, 0x30($sp) -/* B98CA0 802410A0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B98CA4 802410A4 24020002 */ addiu $v0, $zero, 2 -/* B98CA8 802410A8 03E00008 */ jr $ra -/* B98CAC 802410AC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index 1f599c0d12..e99e80b93c 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -129,7 +129,7 @@ glabel func_80240DF0_B9E750 /* B9E938 80240FD8 0000102D */ daddu $v0, $zero, $zero /* B9E93C 80240FDC 0260202D */ daddu $a0, $s3, $zero /* B9E940 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* B9E944 80240FE4 0C09036B */ jal func_80240DAC +/* B9E944 80240FE4 0C09036B */ jal func_80240DAC_B9E70C /* B9E948 80240FE8 0200302D */ daddu $a2, $s0, $zero .L80240FEC: /* B9E94C 80240FEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241E58.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241E58.s deleted file mode 100644 index f2e72387dd..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241E58.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E58 -/* 9C7238 80241E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9C723C 80241E5C AFB10014 */ sw $s1, 0x14($sp) -/* 9C7240 80241E60 0080882D */ daddu $s1, $a0, $zero -/* 9C7244 80241E64 AFBF0024 */ sw $ra, 0x24($sp) -/* 9C7248 80241E68 AFB40020 */ sw $s4, 0x20($sp) -/* 9C724C 80241E6C AFB3001C */ sw $s3, 0x1c($sp) -/* 9C7250 80241E70 AFB20018 */ sw $s2, 0x18($sp) -/* 9C7254 80241E74 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7258 80241E78 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 9C725C 80241E7C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 9C7260 80241E80 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 9C7264 80241E84 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9C7268 80241E88 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9C726C 80241E8C 8E30000C */ lw $s0, 0xc($s1) -/* 9C7270 80241E90 8E130000 */ lw $s3, ($s0) -/* 9C7274 80241E94 26100004 */ addiu $s0, $s0, 4 -/* 9C7278 80241E98 0C0B1EAF */ jal get_variable -/* 9C727C 80241E9C 0260282D */ daddu $a1, $s3, $zero -/* 9C7280 80241EA0 4482E000 */ mtc1 $v0, $f28 -/* 9C7284 80241EA4 00000000 */ nop -/* 9C7288 80241EA8 4680E720 */ cvt.s.w $f28, $f28 -/* 9C728C 80241EAC 8E140000 */ lw $s4, ($s0) -/* 9C7290 80241EB0 26100004 */ addiu $s0, $s0, 4 -/* 9C7294 80241EB4 0220202D */ daddu $a0, $s1, $zero -/* 9C7298 80241EB8 0C0B1EAF */ jal get_variable -/* 9C729C 80241EBC 0280282D */ daddu $a1, $s4, $zero -/* 9C72A0 80241EC0 4482D000 */ mtc1 $v0, $f26 -/* 9C72A4 80241EC4 00000000 */ nop -/* 9C72A8 80241EC8 4680D6A0 */ cvt.s.w $f26, $f26 -/* 9C72AC 80241ECC 8E100000 */ lw $s0, ($s0) -/* 9C72B0 80241ED0 0220202D */ daddu $a0, $s1, $zero -/* 9C72B4 80241ED4 0C0B1EAF */ jal get_variable -/* 9C72B8 80241ED8 0200282D */ daddu $a1, $s0, $zero -/* 9C72BC 80241EDC 4482C000 */ mtc1 $v0, $f24 -/* 9C72C0 80241EE0 00000000 */ nop -/* 9C72C4 80241EE4 4680C620 */ cvt.s.w $f24, $f24 -/* 9C72C8 80241EE8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 9C72CC 80241EEC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 9C72D0 80241EF0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 9C72D4 80241EF4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9C72D8 80241EF8 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 9C72DC 80241EFC 44800000 */ mtc1 $zero, $f0 -/* 9C72E0 80241F00 00031080 */ sll $v0, $v1, 2 -/* 9C72E4 80241F04 00431021 */ addu $v0, $v0, $v1 -/* 9C72E8 80241F08 00021080 */ sll $v0, $v0, 2 -/* 9C72EC 80241F0C 00431023 */ subu $v0, $v0, $v1 -/* 9C72F0 80241F10 000218C0 */ sll $v1, $v0, 3 -/* 9C72F4 80241F14 00431021 */ addu $v0, $v0, $v1 -/* 9C72F8 80241F18 000210C0 */ sll $v0, $v0, 3 -/* 9C72FC 80241F1C 46001032 */ c.eq.s $f2, $f0 -/* 9C7300 80241F20 3C01800B */ lui $at, 0x800b -/* 9C7304 80241F24 00220821 */ addu $at, $at, $v0 -/* 9C7308 80241F28 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 9C730C 80241F2C 45000005 */ bc1f .L80241F44 -/* 9C7310 80241F30 00000000 */ nop -/* 9C7314 80241F34 3C0142C8 */ lui $at, 0x42c8 -/* 9C7318 80241F38 44810000 */ mtc1 $at, $f0 -/* 9C731C 80241F3C 080907D5 */ j .L80241F54 -/* 9C7320 80241F40 4600B581 */ sub.s $f22, $f22, $f0 -.L80241F44: -/* 9C7324 80241F44 3C0142C8 */ lui $at, 0x42c8 -/* 9C7328 80241F48 44810000 */ mtc1 $at, $f0 -/* 9C732C 80241F4C 00000000 */ nop -/* 9C7330 80241F50 4600B580 */ add.s $f22, $f22, $f0 -.L80241F54: -/* 9C7334 80241F54 0C00A6C9 */ jal clamp_angle -/* 9C7338 80241F58 4600B306 */ mov.s $f12, $f22 -/* 9C733C 80241F5C 46000586 */ mov.s $f22, $f0 -/* 9C7340 80241F60 3C014170 */ lui $at, 0x4170 -/* 9C7344 80241F64 4481A000 */ mtc1 $at, $f20 -/* 9C7348 80241F68 0C00A8BB */ jal sin_deg -/* 9C734C 80241F6C 4600B306 */ mov.s $f12, $f22 -/* 9C7350 80241F70 46140002 */ mul.s $f0, $f0, $f20 -/* 9C7354 80241F74 00000000 */ nop -/* 9C7358 80241F78 864200B0 */ lh $v0, 0xb0($s2) -/* 9C735C 80241F7C 3C013F00 */ lui $at, 0x3f00 -/* 9C7360 80241F80 44812000 */ mtc1 $at, $f4 -/* 9C7364 80241F84 44821000 */ mtc1 $v0, $f2 -/* 9C7368 80241F88 00000000 */ nop -/* 9C736C 80241F8C 468010A0 */ cvt.s.w $f2, $f2 -/* 9C7370 80241F90 46041082 */ mul.s $f2, $f2, $f4 -/* 9C7374 80241F94 00000000 */ nop -/* 9C7378 80241F98 4600E700 */ add.s $f28, $f28, $f0 -/* 9C737C 80241F9C 4602D680 */ add.s $f26, $f26, $f2 -/* 9C7380 80241FA0 0C00A8D4 */ jal cos_deg -/* 9C7384 80241FA4 4600B306 */ mov.s $f12, $f22 -/* 9C7388 80241FA8 46140002 */ mul.s $f0, $f0, $f20 -/* 9C738C 80241FAC 00000000 */ nop -/* 9C7390 80241FB0 0220202D */ daddu $a0, $s1, $zero -/* 9C7394 80241FB4 0260282D */ daddu $a1, $s3, $zero -/* 9C7398 80241FB8 4600E18D */ trunc.w.s $f6, $f28 -/* 9C739C 80241FBC 44063000 */ mfc1 $a2, $f6 -/* 9C73A0 80241FC0 0C0B2026 */ jal set_variable -/* 9C73A4 80241FC4 4600C601 */ sub.s $f24, $f24, $f0 -/* 9C73A8 80241FC8 0220202D */ daddu $a0, $s1, $zero -/* 9C73AC 80241FCC 4600D18D */ trunc.w.s $f6, $f26 -/* 9C73B0 80241FD0 44063000 */ mfc1 $a2, $f6 -/* 9C73B4 80241FD4 0C0B2026 */ jal set_variable -/* 9C73B8 80241FD8 0280282D */ daddu $a1, $s4, $zero -/* 9C73BC 80241FDC 0220202D */ daddu $a0, $s1, $zero -/* 9C73C0 80241FE0 4600C18D */ trunc.w.s $f6, $f24 -/* 9C73C4 80241FE4 44063000 */ mfc1 $a2, $f6 -/* 9C73C8 80241FE8 0C0B2026 */ jal set_variable -/* 9C73CC 80241FEC 0200282D */ daddu $a1, $s0, $zero -/* 9C73D0 80241FF0 8FBF0024 */ lw $ra, 0x24($sp) -/* 9C73D4 80241FF4 8FB40020 */ lw $s4, 0x20($sp) -/* 9C73D8 80241FF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C73DC 80241FFC 8FB20018 */ lw $s2, 0x18($sp) -/* 9C73E0 80242000 8FB10014 */ lw $s1, 0x14($sp) -/* 9C73E4 80242004 8FB00010 */ lw $s0, 0x10($sp) -/* 9C73E8 80242008 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9C73EC 8024200C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9C73F0 80242010 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9C73F4 80242014 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9C73F8 80242018 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9C73FC 8024201C 24020002 */ addiu $v0, $zero, 2 -/* 9C7400 80242020 03E00008 */ jr $ra -/* 9C7404 80242024 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240454.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240454.s deleted file mode 100644 index 8003f05e3f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240454.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240454 -/* 9D7474 80240454 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9D7478 80240458 AFB10014 */ sw $s1, 0x14($sp) -/* 9D747C 8024045C 0080882D */ daddu $s1, $a0, $zero -/* 9D7480 80240460 AFBF0024 */ sw $ra, 0x24($sp) -/* 9D7484 80240464 AFB40020 */ sw $s4, 0x20($sp) -/* 9D7488 80240468 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D748C 8024046C AFB20018 */ sw $s2, 0x18($sp) -/* 9D7490 80240470 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7494 80240474 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 9D7498 80240478 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 9D749C 8024047C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 9D74A0 80240480 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9D74A4 80240484 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9D74A8 80240488 8E30000C */ lw $s0, 0xc($s1) -/* 9D74AC 8024048C 8E130000 */ lw $s3, ($s0) -/* 9D74B0 80240490 26100004 */ addiu $s0, $s0, 4 -/* 9D74B4 80240494 0C0B1EAF */ jal get_variable -/* 9D74B8 80240498 0260282D */ daddu $a1, $s3, $zero -/* 9D74BC 8024049C 4482E000 */ mtc1 $v0, $f28 -/* 9D74C0 802404A0 00000000 */ nop -/* 9D74C4 802404A4 4680E720 */ cvt.s.w $f28, $f28 -/* 9D74C8 802404A8 8E140000 */ lw $s4, ($s0) -/* 9D74CC 802404AC 26100004 */ addiu $s0, $s0, 4 -/* 9D74D0 802404B0 0220202D */ daddu $a0, $s1, $zero -/* 9D74D4 802404B4 0C0B1EAF */ jal get_variable -/* 9D74D8 802404B8 0280282D */ daddu $a1, $s4, $zero -/* 9D74DC 802404BC 4482D000 */ mtc1 $v0, $f26 -/* 9D74E0 802404C0 00000000 */ nop -/* 9D74E4 802404C4 4680D6A0 */ cvt.s.w $f26, $f26 -/* 9D74E8 802404C8 8E100000 */ lw $s0, ($s0) -/* 9D74EC 802404CC 0220202D */ daddu $a0, $s1, $zero -/* 9D74F0 802404D0 0C0B1EAF */ jal get_variable -/* 9D74F4 802404D4 0200282D */ daddu $a1, $s0, $zero -/* 9D74F8 802404D8 4482C000 */ mtc1 $v0, $f24 -/* 9D74FC 802404DC 00000000 */ nop -/* 9D7500 802404E0 4680C620 */ cvt.s.w $f24, $f24 -/* 9D7504 802404E4 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 9D7508 802404E8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 9D750C 802404EC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 9D7510 802404F0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9D7514 802404F4 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 9D7518 802404F8 44800000 */ mtc1 $zero, $f0 -/* 9D751C 802404FC 00031080 */ sll $v0, $v1, 2 -/* 9D7520 80240500 00431021 */ addu $v0, $v0, $v1 -/* 9D7524 80240504 00021080 */ sll $v0, $v0, 2 -/* 9D7528 80240508 00431023 */ subu $v0, $v0, $v1 -/* 9D752C 8024050C 000218C0 */ sll $v1, $v0, 3 -/* 9D7530 80240510 00431021 */ addu $v0, $v0, $v1 -/* 9D7534 80240514 000210C0 */ sll $v0, $v0, 3 -/* 9D7538 80240518 46001032 */ c.eq.s $f2, $f0 -/* 9D753C 8024051C 3C01800B */ lui $at, 0x800b -/* 9D7540 80240520 00220821 */ addu $at, $at, $v0 -/* 9D7544 80240524 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 9D7548 80240528 45000005 */ bc1f .L80240540 -/* 9D754C 8024052C 00000000 */ nop -/* 9D7550 80240530 3C0142C8 */ lui $at, 0x42c8 -/* 9D7554 80240534 44810000 */ mtc1 $at, $f0 -/* 9D7558 80240538 08090154 */ j .L80240550 -/* 9D755C 8024053C 4600B581 */ sub.s $f22, $f22, $f0 -.L80240540: -/* 9D7560 80240540 3C0142C8 */ lui $at, 0x42c8 -/* 9D7564 80240544 44810000 */ mtc1 $at, $f0 -/* 9D7568 80240548 00000000 */ nop -/* 9D756C 8024054C 4600B580 */ add.s $f22, $f22, $f0 -.L80240550: -/* 9D7570 80240550 0C00A6C9 */ jal clamp_angle -/* 9D7574 80240554 4600B306 */ mov.s $f12, $f22 -/* 9D7578 80240558 46000586 */ mov.s $f22, $f0 -/* 9D757C 8024055C 3C014170 */ lui $at, 0x4170 -/* 9D7580 80240560 4481A000 */ mtc1 $at, $f20 -/* 9D7584 80240564 0C00A8BB */ jal sin_deg -/* 9D7588 80240568 4600B306 */ mov.s $f12, $f22 -/* 9D758C 8024056C 46140002 */ mul.s $f0, $f0, $f20 -/* 9D7590 80240570 00000000 */ nop -/* 9D7594 80240574 864200B0 */ lh $v0, 0xb0($s2) -/* 9D7598 80240578 3C013F00 */ lui $at, 0x3f00 -/* 9D759C 8024057C 44812000 */ mtc1 $at, $f4 -/* 9D75A0 80240580 44821000 */ mtc1 $v0, $f2 -/* 9D75A4 80240584 00000000 */ nop -/* 9D75A8 80240588 468010A0 */ cvt.s.w $f2, $f2 -/* 9D75AC 8024058C 46041082 */ mul.s $f2, $f2, $f4 -/* 9D75B0 80240590 00000000 */ nop -/* 9D75B4 80240594 4600E700 */ add.s $f28, $f28, $f0 -/* 9D75B8 80240598 4602D680 */ add.s $f26, $f26, $f2 -/* 9D75BC 8024059C 0C00A8D4 */ jal cos_deg -/* 9D75C0 802405A0 4600B306 */ mov.s $f12, $f22 -/* 9D75C4 802405A4 46140002 */ mul.s $f0, $f0, $f20 -/* 9D75C8 802405A8 00000000 */ nop -/* 9D75CC 802405AC 0220202D */ daddu $a0, $s1, $zero -/* 9D75D0 802405B0 0260282D */ daddu $a1, $s3, $zero -/* 9D75D4 802405B4 4600E18D */ trunc.w.s $f6, $f28 -/* 9D75D8 802405B8 44063000 */ mfc1 $a2, $f6 -/* 9D75DC 802405BC 0C0B2026 */ jal set_variable -/* 9D75E0 802405C0 4600C601 */ sub.s $f24, $f24, $f0 -/* 9D75E4 802405C4 0220202D */ daddu $a0, $s1, $zero -/* 9D75E8 802405C8 4600D18D */ trunc.w.s $f6, $f26 -/* 9D75EC 802405CC 44063000 */ mfc1 $a2, $f6 -/* 9D75F0 802405D0 0C0B2026 */ jal set_variable -/* 9D75F4 802405D4 0280282D */ daddu $a1, $s4, $zero -/* 9D75F8 802405D8 0220202D */ daddu $a0, $s1, $zero -/* 9D75FC 802405DC 4600C18D */ trunc.w.s $f6, $f24 -/* 9D7600 802405E0 44063000 */ mfc1 $a2, $f6 -/* 9D7604 802405E4 0C0B2026 */ jal set_variable -/* 9D7608 802405E8 0200282D */ daddu $a1, $s0, $zero -/* 9D760C 802405EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 9D7610 802405F0 8FB40020 */ lw $s4, 0x20($sp) -/* 9D7614 802405F4 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D7618 802405F8 8FB20018 */ lw $s2, 0x18($sp) -/* 9D761C 802405FC 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7620 80240600 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7624 80240604 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9D7628 80240608 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9D762C 8024060C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9D7630 80240610 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9D7634 80240614 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9D7638 80240618 24020002 */ addiu $v0, $zero, 2 -/* 9D763C 8024061C 03E00008 */ jr $ra -/* 9D7640 80240620 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242A00_9D9A20.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242A00_9D9A20.s deleted file mode 100644 index 2091b7ad34..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242A00_9D9A20.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A00_9D9A20 -/* 9D9A20 80242A00 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9D9A24 80242A04 AFB10014 */ sw $s1, 0x14($sp) -/* 9D9A28 80242A08 0080882D */ daddu $s1, $a0, $zero -/* 9D9A2C 80242A0C AFBF0024 */ sw $ra, 0x24($sp) -/* 9D9A30 80242A10 AFB40020 */ sw $s4, 0x20($sp) -/* 9D9A34 80242A14 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D9A38 80242A18 AFB20018 */ sw $s2, 0x18($sp) -/* 9D9A3C 80242A1C AFB00010 */ sw $s0, 0x10($sp) -/* 9D9A40 80242A20 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 9D9A44 80242A24 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 9D9A48 80242A28 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 9D9A4C 80242A2C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9D9A50 80242A30 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9D9A54 80242A34 8E30000C */ lw $s0, 0xc($s1) -/* 9D9A58 80242A38 8E130000 */ lw $s3, ($s0) -/* 9D9A5C 80242A3C 26100004 */ addiu $s0, $s0, 4 -/* 9D9A60 80242A40 0C0B1EAF */ jal get_variable -/* 9D9A64 80242A44 0260282D */ daddu $a1, $s3, $zero -/* 9D9A68 80242A48 4482E000 */ mtc1 $v0, $f28 -/* 9D9A6C 80242A4C 00000000 */ nop -/* 9D9A70 80242A50 4680E720 */ cvt.s.w $f28, $f28 -/* 9D9A74 80242A54 8E140000 */ lw $s4, ($s0) -/* 9D9A78 80242A58 26100004 */ addiu $s0, $s0, 4 -/* 9D9A7C 80242A5C 0220202D */ daddu $a0, $s1, $zero -/* 9D9A80 80242A60 0C0B1EAF */ jal get_variable -/* 9D9A84 80242A64 0280282D */ daddu $a1, $s4, $zero -/* 9D9A88 80242A68 4482D000 */ mtc1 $v0, $f26 -/* 9D9A8C 80242A6C 00000000 */ nop -/* 9D9A90 80242A70 4680D6A0 */ cvt.s.w $f26, $f26 -/* 9D9A94 80242A74 8E100000 */ lw $s0, ($s0) -/* 9D9A98 80242A78 0220202D */ daddu $a0, $s1, $zero -/* 9D9A9C 80242A7C 0C0B1EAF */ jal get_variable -/* 9D9AA0 80242A80 0200282D */ daddu $a1, $s0, $zero -/* 9D9AA4 80242A84 4482C000 */ mtc1 $v0, $f24 -/* 9D9AA8 80242A88 00000000 */ nop -/* 9D9AAC 80242A8C 4680C620 */ cvt.s.w $f24, $f24 -/* 9D9AB0 80242A90 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 9D9AB4 80242A94 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 9D9AB8 80242A98 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 9D9ABC 80242A9C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9D9AC0 80242AA0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 9D9AC4 80242AA4 44800000 */ mtc1 $zero, $f0 -/* 9D9AC8 80242AA8 00031080 */ sll $v0, $v1, 2 -/* 9D9ACC 80242AAC 00431021 */ addu $v0, $v0, $v1 -/* 9D9AD0 80242AB0 00021080 */ sll $v0, $v0, 2 -/* 9D9AD4 80242AB4 00431023 */ subu $v0, $v0, $v1 -/* 9D9AD8 80242AB8 000218C0 */ sll $v1, $v0, 3 -/* 9D9ADC 80242ABC 00431021 */ addu $v0, $v0, $v1 -/* 9D9AE0 80242AC0 000210C0 */ sll $v0, $v0, 3 -/* 9D9AE4 80242AC4 46001032 */ c.eq.s $f2, $f0 -/* 9D9AE8 80242AC8 3C01800B */ lui $at, 0x800b -/* 9D9AEC 80242ACC 00220821 */ addu $at, $at, $v0 -/* 9D9AF0 80242AD0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 9D9AF4 80242AD4 45000005 */ bc1f .L80242AEC -/* 9D9AF8 80242AD8 00000000 */ nop -/* 9D9AFC 80242ADC 3C0142C8 */ lui $at, 0x42c8 -/* 9D9B00 80242AE0 44810000 */ mtc1 $at, $f0 -/* 9D9B04 80242AE4 08090ABF */ j .L80242AFC -/* 9D9B08 80242AE8 4600B581 */ sub.s $f22, $f22, $f0 -.L80242AEC: -/* 9D9B0C 80242AEC 3C0142C8 */ lui $at, 0x42c8 -/* 9D9B10 80242AF0 44810000 */ mtc1 $at, $f0 -/* 9D9B14 80242AF4 00000000 */ nop -/* 9D9B18 80242AF8 4600B580 */ add.s $f22, $f22, $f0 -.L80242AFC: -/* 9D9B1C 80242AFC 0C00A6C9 */ jal clamp_angle -/* 9D9B20 80242B00 4600B306 */ mov.s $f12, $f22 -/* 9D9B24 80242B04 46000586 */ mov.s $f22, $f0 -/* 9D9B28 80242B08 3C014170 */ lui $at, 0x4170 -/* 9D9B2C 80242B0C 4481A000 */ mtc1 $at, $f20 -/* 9D9B30 80242B10 0C00A8BB */ jal sin_deg -/* 9D9B34 80242B14 4600B306 */ mov.s $f12, $f22 -/* 9D9B38 80242B18 46140002 */ mul.s $f0, $f0, $f20 -/* 9D9B3C 80242B1C 00000000 */ nop -/* 9D9B40 80242B20 864200B0 */ lh $v0, 0xb0($s2) -/* 9D9B44 80242B24 3C013F00 */ lui $at, 0x3f00 -/* 9D9B48 80242B28 44812000 */ mtc1 $at, $f4 -/* 9D9B4C 80242B2C 44821000 */ mtc1 $v0, $f2 -/* 9D9B50 80242B30 00000000 */ nop -/* 9D9B54 80242B34 468010A0 */ cvt.s.w $f2, $f2 -/* 9D9B58 80242B38 46041082 */ mul.s $f2, $f2, $f4 -/* 9D9B5C 80242B3C 00000000 */ nop -/* 9D9B60 80242B40 4600E700 */ add.s $f28, $f28, $f0 -/* 9D9B64 80242B44 4602D680 */ add.s $f26, $f26, $f2 -/* 9D9B68 80242B48 0C00A8D4 */ jal cos_deg -/* 9D9B6C 80242B4C 4600B306 */ mov.s $f12, $f22 -/* 9D9B70 80242B50 46140002 */ mul.s $f0, $f0, $f20 -/* 9D9B74 80242B54 00000000 */ nop -/* 9D9B78 80242B58 0220202D */ daddu $a0, $s1, $zero -/* 9D9B7C 80242B5C 0260282D */ daddu $a1, $s3, $zero -/* 9D9B80 80242B60 4600E18D */ trunc.w.s $f6, $f28 -/* 9D9B84 80242B64 44063000 */ mfc1 $a2, $f6 -/* 9D9B88 80242B68 0C0B2026 */ jal set_variable -/* 9D9B8C 80242B6C 4600C601 */ sub.s $f24, $f24, $f0 -/* 9D9B90 80242B70 0220202D */ daddu $a0, $s1, $zero -/* 9D9B94 80242B74 4600D18D */ trunc.w.s $f6, $f26 -/* 9D9B98 80242B78 44063000 */ mfc1 $a2, $f6 -/* 9D9B9C 80242B7C 0C0B2026 */ jal set_variable -/* 9D9BA0 80242B80 0280282D */ daddu $a1, $s4, $zero -/* 9D9BA4 80242B84 0220202D */ daddu $a0, $s1, $zero -/* 9D9BA8 80242B88 4600C18D */ trunc.w.s $f6, $f24 -/* 9D9BAC 80242B8C 44063000 */ mfc1 $a2, $f6 -/* 9D9BB0 80242B90 0C0B2026 */ jal set_variable -/* 9D9BB4 80242B94 0200282D */ daddu $a1, $s0, $zero -/* 9D9BB8 80242B98 8FBF0024 */ lw $ra, 0x24($sp) -/* 9D9BBC 80242B9C 8FB40020 */ lw $s4, 0x20($sp) -/* 9D9BC0 80242BA0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D9BC4 80242BA4 8FB20018 */ lw $s2, 0x18($sp) -/* 9D9BC8 80242BA8 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9BCC 80242BAC 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9BD0 80242BB0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9D9BD4 80242BB4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9D9BD8 80242BB8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9D9BDC 80242BBC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9D9BE0 80242BC0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9D9BE4 80242BC4 24020002 */ addiu $v0, $zero, 2 -/* 9D9BE8 80242BC8 03E00008 */ jr $ra -/* 9D9BEC 80242BCC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243A1C.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243A1C.s deleted file mode 100644 index 0076e3ec3d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243A1C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243A1C -/* 9DAA3C 80243A1C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9DAA40 80243A20 AFB10014 */ sw $s1, 0x14($sp) -/* 9DAA44 80243A24 0080882D */ daddu $s1, $a0, $zero -/* 9DAA48 80243A28 AFBF0024 */ sw $ra, 0x24($sp) -/* 9DAA4C 80243A2C AFB40020 */ sw $s4, 0x20($sp) -/* 9DAA50 80243A30 AFB3001C */ sw $s3, 0x1c($sp) -/* 9DAA54 80243A34 AFB20018 */ sw $s2, 0x18($sp) -/* 9DAA58 80243A38 AFB00010 */ sw $s0, 0x10($sp) -/* 9DAA5C 80243A3C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 9DAA60 80243A40 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 9DAA64 80243A44 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 9DAA68 80243A48 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9DAA6C 80243A4C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9DAA70 80243A50 8E30000C */ lw $s0, 0xc($s1) -/* 9DAA74 80243A54 8E130000 */ lw $s3, ($s0) -/* 9DAA78 80243A58 26100004 */ addiu $s0, $s0, 4 -/* 9DAA7C 80243A5C 0C0B1EAF */ jal get_variable -/* 9DAA80 80243A60 0260282D */ daddu $a1, $s3, $zero -/* 9DAA84 80243A64 4482E000 */ mtc1 $v0, $f28 -/* 9DAA88 80243A68 00000000 */ nop -/* 9DAA8C 80243A6C 4680E720 */ cvt.s.w $f28, $f28 -/* 9DAA90 80243A70 8E140000 */ lw $s4, ($s0) -/* 9DAA94 80243A74 26100004 */ addiu $s0, $s0, 4 -/* 9DAA98 80243A78 0220202D */ daddu $a0, $s1, $zero -/* 9DAA9C 80243A7C 0C0B1EAF */ jal get_variable -/* 9DAAA0 80243A80 0280282D */ daddu $a1, $s4, $zero -/* 9DAAA4 80243A84 4482D000 */ mtc1 $v0, $f26 -/* 9DAAA8 80243A88 00000000 */ nop -/* 9DAAAC 80243A8C 4680D6A0 */ cvt.s.w $f26, $f26 -/* 9DAAB0 80243A90 8E100000 */ lw $s0, ($s0) -/* 9DAAB4 80243A94 0220202D */ daddu $a0, $s1, $zero -/* 9DAAB8 80243A98 0C0B1EAF */ jal get_variable -/* 9DAABC 80243A9C 0200282D */ daddu $a1, $s0, $zero -/* 9DAAC0 80243AA0 4482C000 */ mtc1 $v0, $f24 -/* 9DAAC4 80243AA4 00000000 */ nop -/* 9DAAC8 80243AA8 4680C620 */ cvt.s.w $f24, $f24 -/* 9DAACC 80243AAC 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 9DAAD0 80243AB0 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 9DAAD4 80243AB4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 9DAAD8 80243AB8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9DAADC 80243ABC C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 9DAAE0 80243AC0 44800000 */ mtc1 $zero, $f0 -/* 9DAAE4 80243AC4 00031080 */ sll $v0, $v1, 2 -/* 9DAAE8 80243AC8 00431021 */ addu $v0, $v0, $v1 -/* 9DAAEC 80243ACC 00021080 */ sll $v0, $v0, 2 -/* 9DAAF0 80243AD0 00431023 */ subu $v0, $v0, $v1 -/* 9DAAF4 80243AD4 000218C0 */ sll $v1, $v0, 3 -/* 9DAAF8 80243AD8 00431021 */ addu $v0, $v0, $v1 -/* 9DAAFC 80243ADC 000210C0 */ sll $v0, $v0, 3 -/* 9DAB00 80243AE0 46001032 */ c.eq.s $f2, $f0 -/* 9DAB04 80243AE4 3C01800B */ lui $at, 0x800b -/* 9DAB08 80243AE8 00220821 */ addu $at, $at, $v0 -/* 9DAB0C 80243AEC C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 9DAB10 80243AF0 45000005 */ bc1f .L80243B08 -/* 9DAB14 80243AF4 00000000 */ nop -/* 9DAB18 80243AF8 3C0142C8 */ lui $at, 0x42c8 -/* 9DAB1C 80243AFC 44810000 */ mtc1 $at, $f0 -/* 9DAB20 80243B00 08090EC6 */ j .L80243B18 -/* 9DAB24 80243B04 4600B581 */ sub.s $f22, $f22, $f0 -.L80243B08: -/* 9DAB28 80243B08 3C0142C8 */ lui $at, 0x42c8 -/* 9DAB2C 80243B0C 44810000 */ mtc1 $at, $f0 -/* 9DAB30 80243B10 00000000 */ nop -/* 9DAB34 80243B14 4600B580 */ add.s $f22, $f22, $f0 -.L80243B18: -/* 9DAB38 80243B18 0C00A6C9 */ jal clamp_angle -/* 9DAB3C 80243B1C 4600B306 */ mov.s $f12, $f22 -/* 9DAB40 80243B20 46000586 */ mov.s $f22, $f0 -/* 9DAB44 80243B24 3C014170 */ lui $at, 0x4170 -/* 9DAB48 80243B28 4481A000 */ mtc1 $at, $f20 -/* 9DAB4C 80243B2C 0C00A8BB */ jal sin_deg -/* 9DAB50 80243B30 4600B306 */ mov.s $f12, $f22 -/* 9DAB54 80243B34 46140002 */ mul.s $f0, $f0, $f20 -/* 9DAB58 80243B38 00000000 */ nop -/* 9DAB5C 80243B3C 864200B0 */ lh $v0, 0xb0($s2) -/* 9DAB60 80243B40 3C013F00 */ lui $at, 0x3f00 -/* 9DAB64 80243B44 44812000 */ mtc1 $at, $f4 -/* 9DAB68 80243B48 44821000 */ mtc1 $v0, $f2 -/* 9DAB6C 80243B4C 00000000 */ nop -/* 9DAB70 80243B50 468010A0 */ cvt.s.w $f2, $f2 -/* 9DAB74 80243B54 46041082 */ mul.s $f2, $f2, $f4 -/* 9DAB78 80243B58 00000000 */ nop -/* 9DAB7C 80243B5C 4600E700 */ add.s $f28, $f28, $f0 -/* 9DAB80 80243B60 4602D680 */ add.s $f26, $f26, $f2 -/* 9DAB84 80243B64 0C00A8D4 */ jal cos_deg -/* 9DAB88 80243B68 4600B306 */ mov.s $f12, $f22 -/* 9DAB8C 80243B6C 46140002 */ mul.s $f0, $f0, $f20 -/* 9DAB90 80243B70 00000000 */ nop -/* 9DAB94 80243B74 0220202D */ daddu $a0, $s1, $zero -/* 9DAB98 80243B78 0260282D */ daddu $a1, $s3, $zero -/* 9DAB9C 80243B7C 4600E18D */ trunc.w.s $f6, $f28 -/* 9DABA0 80243B80 44063000 */ mfc1 $a2, $f6 -/* 9DABA4 80243B84 0C0B2026 */ jal set_variable -/* 9DABA8 80243B88 4600C601 */ sub.s $f24, $f24, $f0 -/* 9DABAC 80243B8C 0220202D */ daddu $a0, $s1, $zero -/* 9DABB0 80243B90 4600D18D */ trunc.w.s $f6, $f26 -/* 9DABB4 80243B94 44063000 */ mfc1 $a2, $f6 -/* 9DABB8 80243B98 0C0B2026 */ jal set_variable -/* 9DABBC 80243B9C 0280282D */ daddu $a1, $s4, $zero -/* 9DABC0 80243BA0 0220202D */ daddu $a0, $s1, $zero -/* 9DABC4 80243BA4 4600C18D */ trunc.w.s $f6, $f24 -/* 9DABC8 80243BA8 44063000 */ mfc1 $a2, $f6 -/* 9DABCC 80243BAC 0C0B2026 */ jal set_variable -/* 9DABD0 80243BB0 0200282D */ daddu $a1, $s0, $zero -/* 9DABD4 80243BB4 8FBF0024 */ lw $ra, 0x24($sp) -/* 9DABD8 80243BB8 8FB40020 */ lw $s4, 0x20($sp) -/* 9DABDC 80243BBC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9DABE0 80243BC0 8FB20018 */ lw $s2, 0x18($sp) -/* 9DABE4 80243BC4 8FB10014 */ lw $s1, 0x14($sp) -/* 9DABE8 80243BC8 8FB00010 */ lw $s0, 0x10($sp) -/* 9DABEC 80243BCC D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9DABF0 80243BD0 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9DABF4 80243BD4 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9DABF8 80243BD8 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9DABFC 80243BDC D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9DAC00 80243BE0 24020002 */ addiu $v0, $zero, 2 -/* 9DAC04 80243BE4 03E00008 */ jr $ra -/* 9DAC08 80243BE8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240954_BBDAF4.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240954_BBDAF4.s deleted file mode 100644 index b14d1204c4..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240954_BBDAF4.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240954_BBDAF4 -/* BBDAF4 80240954 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BBDAF8 80240958 AFB10014 */ sw $s1, 0x14($sp) -/* BBDAFC 8024095C 0080882D */ daddu $s1, $a0, $zero -/* BBDB00 80240960 AFBF0024 */ sw $ra, 0x24($sp) -/* BBDB04 80240964 AFB40020 */ sw $s4, 0x20($sp) -/* BBDB08 80240968 AFB3001C */ sw $s3, 0x1c($sp) -/* BBDB0C 8024096C AFB20018 */ sw $s2, 0x18($sp) -/* BBDB10 80240970 AFB00010 */ sw $s0, 0x10($sp) -/* BBDB14 80240974 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* BBDB18 80240978 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* BBDB1C 8024097C F7B80038 */ sdc1 $f24, 0x38($sp) -/* BBDB20 80240980 F7B60030 */ sdc1 $f22, 0x30($sp) -/* BBDB24 80240984 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BBDB28 80240988 8E30000C */ lw $s0, 0xc($s1) -/* BBDB2C 8024098C 8E130000 */ lw $s3, ($s0) -/* BBDB30 80240990 26100004 */ addiu $s0, $s0, 4 -/* BBDB34 80240994 0C0B1EAF */ jal get_variable -/* BBDB38 80240998 0260282D */ daddu $a1, $s3, $zero -/* BBDB3C 8024099C 4482E000 */ mtc1 $v0, $f28 -/* BBDB40 802409A0 00000000 */ nop -/* BBDB44 802409A4 4680E720 */ cvt.s.w $f28, $f28 -/* BBDB48 802409A8 8E140000 */ lw $s4, ($s0) -/* BBDB4C 802409AC 26100004 */ addiu $s0, $s0, 4 -/* BBDB50 802409B0 0220202D */ daddu $a0, $s1, $zero -/* BBDB54 802409B4 0C0B1EAF */ jal get_variable -/* BBDB58 802409B8 0280282D */ daddu $a1, $s4, $zero -/* BBDB5C 802409BC 4482D000 */ mtc1 $v0, $f26 -/* BBDB60 802409C0 00000000 */ nop -/* BBDB64 802409C4 4680D6A0 */ cvt.s.w $f26, $f26 -/* BBDB68 802409C8 8E100000 */ lw $s0, ($s0) -/* BBDB6C 802409CC 0220202D */ daddu $a0, $s1, $zero -/* BBDB70 802409D0 0C0B1EAF */ jal get_variable -/* BBDB74 802409D4 0200282D */ daddu $a1, $s0, $zero -/* BBDB78 802409D8 4482C000 */ mtc1 $v0, $f24 -/* BBDB7C 802409DC 00000000 */ nop -/* BBDB80 802409E0 4680C620 */ cvt.s.w $f24, $f24 -/* BBDB84 802409E4 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* BBDB88 802409E8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* BBDB8C 802409EC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BBDB90 802409F0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BBDB94 802409F4 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* BBDB98 802409F8 44800000 */ mtc1 $zero, $f0 -/* BBDB9C 802409FC 00031080 */ sll $v0, $v1, 2 -/* BBDBA0 80240A00 00431021 */ addu $v0, $v0, $v1 -/* BBDBA4 80240A04 00021080 */ sll $v0, $v0, 2 -/* BBDBA8 80240A08 00431023 */ subu $v0, $v0, $v1 -/* BBDBAC 80240A0C 000218C0 */ sll $v1, $v0, 3 -/* BBDBB0 80240A10 00431021 */ addu $v0, $v0, $v1 -/* BBDBB4 80240A14 000210C0 */ sll $v0, $v0, 3 -/* BBDBB8 80240A18 46001032 */ c.eq.s $f2, $f0 -/* BBDBBC 80240A1C 3C01800B */ lui $at, 0x800b -/* BBDBC0 80240A20 00220821 */ addu $at, $at, $v0 -/* BBDBC4 80240A24 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* BBDBC8 80240A28 45000005 */ bc1f .L80240A40 -/* BBDBCC 80240A2C 00000000 */ nop -/* BBDBD0 80240A30 3C0142C8 */ lui $at, 0x42c8 -/* BBDBD4 80240A34 44810000 */ mtc1 $at, $f0 -/* BBDBD8 80240A38 08090294 */ j .L80240A50 -/* BBDBDC 80240A3C 4600B581 */ sub.s $f22, $f22, $f0 -.L80240A40: -/* BBDBE0 80240A40 3C0142C8 */ lui $at, 0x42c8 -/* BBDBE4 80240A44 44810000 */ mtc1 $at, $f0 -/* BBDBE8 80240A48 00000000 */ nop -/* BBDBEC 80240A4C 4600B580 */ add.s $f22, $f22, $f0 -.L80240A50: -/* BBDBF0 80240A50 0C00A6C9 */ jal clamp_angle -/* BBDBF4 80240A54 4600B306 */ mov.s $f12, $f22 -/* BBDBF8 80240A58 46000586 */ mov.s $f22, $f0 -/* BBDBFC 80240A5C 3C014170 */ lui $at, 0x4170 -/* BBDC00 80240A60 4481A000 */ mtc1 $at, $f20 -/* BBDC04 80240A64 0C00A8BB */ jal sin_deg -/* BBDC08 80240A68 4600B306 */ mov.s $f12, $f22 -/* BBDC0C 80240A6C 46140002 */ mul.s $f0, $f0, $f20 -/* BBDC10 80240A70 00000000 */ nop -/* BBDC14 80240A74 864200B0 */ lh $v0, 0xb0($s2) -/* BBDC18 80240A78 3C013F00 */ lui $at, 0x3f00 -/* BBDC1C 80240A7C 44812000 */ mtc1 $at, $f4 -/* BBDC20 80240A80 44821000 */ mtc1 $v0, $f2 -/* BBDC24 80240A84 00000000 */ nop -/* BBDC28 80240A88 468010A0 */ cvt.s.w $f2, $f2 -/* BBDC2C 80240A8C 46041082 */ mul.s $f2, $f2, $f4 -/* BBDC30 80240A90 00000000 */ nop -/* BBDC34 80240A94 4600E700 */ add.s $f28, $f28, $f0 -/* BBDC38 80240A98 4602D680 */ add.s $f26, $f26, $f2 -/* BBDC3C 80240A9C 0C00A8D4 */ jal cos_deg -/* BBDC40 80240AA0 4600B306 */ mov.s $f12, $f22 -/* BBDC44 80240AA4 46140002 */ mul.s $f0, $f0, $f20 -/* BBDC48 80240AA8 00000000 */ nop -/* BBDC4C 80240AAC 0220202D */ daddu $a0, $s1, $zero -/* BBDC50 80240AB0 0260282D */ daddu $a1, $s3, $zero -/* BBDC54 80240AB4 4600E18D */ trunc.w.s $f6, $f28 -/* BBDC58 80240AB8 44063000 */ mfc1 $a2, $f6 -/* BBDC5C 80240ABC 0C0B2026 */ jal set_variable -/* BBDC60 80240AC0 4600C601 */ sub.s $f24, $f24, $f0 -/* BBDC64 80240AC4 0220202D */ daddu $a0, $s1, $zero -/* BBDC68 80240AC8 4600D18D */ trunc.w.s $f6, $f26 -/* BBDC6C 80240ACC 44063000 */ mfc1 $a2, $f6 -/* BBDC70 80240AD0 0C0B2026 */ jal set_variable -/* BBDC74 80240AD4 0280282D */ daddu $a1, $s4, $zero -/* BBDC78 80240AD8 0220202D */ daddu $a0, $s1, $zero -/* BBDC7C 80240ADC 4600C18D */ trunc.w.s $f6, $f24 -/* BBDC80 80240AE0 44063000 */ mfc1 $a2, $f6 -/* BBDC84 80240AE4 0C0B2026 */ jal set_variable -/* BBDC88 80240AE8 0200282D */ daddu $a1, $s0, $zero -/* BBDC8C 80240AEC 8FBF0024 */ lw $ra, 0x24($sp) -/* BBDC90 80240AF0 8FB40020 */ lw $s4, 0x20($sp) -/* BBDC94 80240AF4 8FB3001C */ lw $s3, 0x1c($sp) -/* BBDC98 80240AF8 8FB20018 */ lw $s2, 0x18($sp) -/* BBDC9C 80240AFC 8FB10014 */ lw $s1, 0x14($sp) -/* BBDCA0 80240B00 8FB00010 */ lw $s0, 0x10($sp) -/* BBDCA4 80240B04 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* BBDCA8 80240B08 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* BBDCAC 80240B0C D7B80038 */ ldc1 $f24, 0x38($sp) -/* BBDCB0 80240B10 D7B60030 */ ldc1 $f22, 0x30($sp) -/* BBDCB4 80240B14 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BBDCB8 80240B18 24020002 */ addiu $v0, $zero, 2 -/* BBDCBC 80240B1C 03E00008 */ jr $ra -/* BBDCC0 80240B20 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802402E4.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802402E4.s deleted file mode 100644 index deb224ccd3..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802402E4.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E4 -/* BC4564 802402E4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BC4568 802402E8 AFB10014 */ sw $s1, 0x14($sp) -/* BC456C 802402EC 0080882D */ daddu $s1, $a0, $zero -/* BC4570 802402F0 AFBF0024 */ sw $ra, 0x24($sp) -/* BC4574 802402F4 AFB40020 */ sw $s4, 0x20($sp) -/* BC4578 802402F8 AFB3001C */ sw $s3, 0x1c($sp) -/* BC457C 802402FC AFB20018 */ sw $s2, 0x18($sp) -/* BC4580 80240300 AFB00010 */ sw $s0, 0x10($sp) -/* BC4584 80240304 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* BC4588 80240308 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* BC458C 8024030C F7B80038 */ sdc1 $f24, 0x38($sp) -/* BC4590 80240310 F7B60030 */ sdc1 $f22, 0x30($sp) -/* BC4594 80240314 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BC4598 80240318 8E30000C */ lw $s0, 0xc($s1) -/* BC459C 8024031C 8E130000 */ lw $s3, ($s0) -/* BC45A0 80240320 26100004 */ addiu $s0, $s0, 4 -/* BC45A4 80240324 0C0B1EAF */ jal get_variable -/* BC45A8 80240328 0260282D */ daddu $a1, $s3, $zero -/* BC45AC 8024032C 4482E000 */ mtc1 $v0, $f28 -/* BC45B0 80240330 00000000 */ nop -/* BC45B4 80240334 4680E720 */ cvt.s.w $f28, $f28 -/* BC45B8 80240338 8E140000 */ lw $s4, ($s0) -/* BC45BC 8024033C 26100004 */ addiu $s0, $s0, 4 -/* BC45C0 80240340 0220202D */ daddu $a0, $s1, $zero -/* BC45C4 80240344 0C0B1EAF */ jal get_variable -/* BC45C8 80240348 0280282D */ daddu $a1, $s4, $zero -/* BC45CC 8024034C 4482D000 */ mtc1 $v0, $f26 -/* BC45D0 80240350 00000000 */ nop -/* BC45D4 80240354 4680D6A0 */ cvt.s.w $f26, $f26 -/* BC45D8 80240358 8E100000 */ lw $s0, ($s0) -/* BC45DC 8024035C 0220202D */ daddu $a0, $s1, $zero -/* BC45E0 80240360 0C0B1EAF */ jal get_variable -/* BC45E4 80240364 0200282D */ daddu $a1, $s0, $zero -/* BC45E8 80240368 4482C000 */ mtc1 $v0, $f24 -/* BC45EC 8024036C 00000000 */ nop -/* BC45F0 80240370 4680C620 */ cvt.s.w $f24, $f24 -/* BC45F4 80240374 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* BC45F8 80240378 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* BC45FC 8024037C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BC4600 80240380 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BC4604 80240384 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* BC4608 80240388 44800000 */ mtc1 $zero, $f0 -/* BC460C 8024038C 00031080 */ sll $v0, $v1, 2 -/* BC4610 80240390 00431021 */ addu $v0, $v0, $v1 -/* BC4614 80240394 00021080 */ sll $v0, $v0, 2 -/* BC4618 80240398 00431023 */ subu $v0, $v0, $v1 -/* BC461C 8024039C 000218C0 */ sll $v1, $v0, 3 -/* BC4620 802403A0 00431021 */ addu $v0, $v0, $v1 -/* BC4624 802403A4 000210C0 */ sll $v0, $v0, 3 -/* BC4628 802403A8 46001032 */ c.eq.s $f2, $f0 -/* BC462C 802403AC 3C01800B */ lui $at, 0x800b -/* BC4630 802403B0 00220821 */ addu $at, $at, $v0 -/* BC4634 802403B4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* BC4638 802403B8 45000005 */ bc1f .L802403D0 -/* BC463C 802403BC 00000000 */ nop -/* BC4640 802403C0 3C0142C8 */ lui $at, 0x42c8 -/* BC4644 802403C4 44810000 */ mtc1 $at, $f0 -/* BC4648 802403C8 080900F8 */ j .L802403E0 -/* BC464C 802403CC 4600B581 */ sub.s $f22, $f22, $f0 -.L802403D0: -/* BC4650 802403D0 3C0142C8 */ lui $at, 0x42c8 -/* BC4654 802403D4 44810000 */ mtc1 $at, $f0 -/* BC4658 802403D8 00000000 */ nop -/* BC465C 802403DC 4600B580 */ add.s $f22, $f22, $f0 -.L802403E0: -/* BC4660 802403E0 0C00A6C9 */ jal clamp_angle -/* BC4664 802403E4 4600B306 */ mov.s $f12, $f22 -/* BC4668 802403E8 46000586 */ mov.s $f22, $f0 -/* BC466C 802403EC 3C014170 */ lui $at, 0x4170 -/* BC4670 802403F0 4481A000 */ mtc1 $at, $f20 -/* BC4674 802403F4 0C00A8BB */ jal sin_deg -/* BC4678 802403F8 4600B306 */ mov.s $f12, $f22 -/* BC467C 802403FC 46140002 */ mul.s $f0, $f0, $f20 -/* BC4680 80240400 00000000 */ nop -/* BC4684 80240404 864200B0 */ lh $v0, 0xb0($s2) -/* BC4688 80240408 3C013F00 */ lui $at, 0x3f00 -/* BC468C 8024040C 44812000 */ mtc1 $at, $f4 -/* BC4690 80240410 44821000 */ mtc1 $v0, $f2 -/* BC4694 80240414 00000000 */ nop -/* BC4698 80240418 468010A0 */ cvt.s.w $f2, $f2 -/* BC469C 8024041C 46041082 */ mul.s $f2, $f2, $f4 -/* BC46A0 80240420 00000000 */ nop -/* BC46A4 80240424 4600E700 */ add.s $f28, $f28, $f0 -/* BC46A8 80240428 4602D680 */ add.s $f26, $f26, $f2 -/* BC46AC 8024042C 0C00A8D4 */ jal cos_deg -/* BC46B0 80240430 4600B306 */ mov.s $f12, $f22 -/* BC46B4 80240434 46140002 */ mul.s $f0, $f0, $f20 -/* BC46B8 80240438 00000000 */ nop -/* BC46BC 8024043C 0220202D */ daddu $a0, $s1, $zero -/* BC46C0 80240440 0260282D */ daddu $a1, $s3, $zero -/* BC46C4 80240444 4600E18D */ trunc.w.s $f6, $f28 -/* BC46C8 80240448 44063000 */ mfc1 $a2, $f6 -/* BC46CC 8024044C 0C0B2026 */ jal set_variable -/* BC46D0 80240450 4600C601 */ sub.s $f24, $f24, $f0 -/* BC46D4 80240454 0220202D */ daddu $a0, $s1, $zero -/* BC46D8 80240458 4600D18D */ trunc.w.s $f6, $f26 -/* BC46DC 8024045C 44063000 */ mfc1 $a2, $f6 -/* BC46E0 80240460 0C0B2026 */ jal set_variable -/* BC46E4 80240464 0280282D */ daddu $a1, $s4, $zero -/* BC46E8 80240468 0220202D */ daddu $a0, $s1, $zero -/* BC46EC 8024046C 4600C18D */ trunc.w.s $f6, $f24 -/* BC46F0 80240470 44063000 */ mfc1 $a2, $f6 -/* BC46F4 80240474 0C0B2026 */ jal set_variable -/* BC46F8 80240478 0200282D */ daddu $a1, $s0, $zero -/* BC46FC 8024047C 8FBF0024 */ lw $ra, 0x24($sp) -/* BC4700 80240480 8FB40020 */ lw $s4, 0x20($sp) -/* BC4704 80240484 8FB3001C */ lw $s3, 0x1c($sp) -/* BC4708 80240488 8FB20018 */ lw $s2, 0x18($sp) -/* BC470C 8024048C 8FB10014 */ lw $s1, 0x14($sp) -/* BC4710 80240490 8FB00010 */ lw $s0, 0x10($sp) -/* BC4714 80240494 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* BC4718 80240498 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* BC471C 8024049C D7B80038 */ ldc1 $f24, 0x38($sp) -/* BC4720 802404A0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* BC4724 802404A4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BC4728 802404A8 24020002 */ addiu $v0, $zero, 2 -/* BC472C 802404AC 03E00008 */ jr $ra -/* BC4730 802404B0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241FA8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241FA8.s deleted file mode 100644 index 3d65b46623..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241FA8.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FA8 -/* DB4268 80241FA8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DB426C 80241FAC AFB10014 */ sw $s1, 0x14($sp) -/* DB4270 80241FB0 0080882D */ daddu $s1, $a0, $zero -/* DB4274 80241FB4 AFBF0024 */ sw $ra, 0x24($sp) -/* DB4278 80241FB8 AFB40020 */ sw $s4, 0x20($sp) -/* DB427C 80241FBC AFB3001C */ sw $s3, 0x1c($sp) -/* DB4280 80241FC0 AFB20018 */ sw $s2, 0x18($sp) -/* DB4284 80241FC4 AFB00010 */ sw $s0, 0x10($sp) -/* DB4288 80241FC8 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* DB428C 80241FCC F7BA0040 */ sdc1 $f26, 0x40($sp) -/* DB4290 80241FD0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* DB4294 80241FD4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* DB4298 80241FD8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* DB429C 80241FDC 8E30000C */ lw $s0, 0xc($s1) -/* DB42A0 80241FE0 8E130000 */ lw $s3, ($s0) -/* DB42A4 80241FE4 26100004 */ addiu $s0, $s0, 4 -/* DB42A8 80241FE8 0C0B1EAF */ jal get_variable -/* DB42AC 80241FEC 0260282D */ daddu $a1, $s3, $zero -/* DB42B0 80241FF0 4482E000 */ mtc1 $v0, $f28 -/* DB42B4 80241FF4 00000000 */ nop -/* DB42B8 80241FF8 4680E720 */ cvt.s.w $f28, $f28 -/* DB42BC 80241FFC 8E140000 */ lw $s4, ($s0) -/* DB42C0 80242000 26100004 */ addiu $s0, $s0, 4 -/* DB42C4 80242004 0220202D */ daddu $a0, $s1, $zero -/* DB42C8 80242008 0C0B1EAF */ jal get_variable -/* DB42CC 8024200C 0280282D */ daddu $a1, $s4, $zero -/* DB42D0 80242010 4482D000 */ mtc1 $v0, $f26 -/* DB42D4 80242014 00000000 */ nop -/* DB42D8 80242018 4680D6A0 */ cvt.s.w $f26, $f26 -/* DB42DC 8024201C 8E100000 */ lw $s0, ($s0) -/* DB42E0 80242020 0220202D */ daddu $a0, $s1, $zero -/* DB42E4 80242024 0C0B1EAF */ jal get_variable -/* DB42E8 80242028 0200282D */ daddu $a1, $s0, $zero -/* DB42EC 8024202C 4482C000 */ mtc1 $v0, $f24 -/* DB42F0 80242030 00000000 */ nop -/* DB42F4 80242034 4680C620 */ cvt.s.w $f24, $f24 -/* DB42F8 80242038 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* DB42FC 8024203C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* DB4300 80242040 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* DB4304 80242044 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* DB4308 80242048 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* DB430C 8024204C 44800000 */ mtc1 $zero, $f0 -/* DB4310 80242050 00031080 */ sll $v0, $v1, 2 -/* DB4314 80242054 00431021 */ addu $v0, $v0, $v1 -/* DB4318 80242058 00021080 */ sll $v0, $v0, 2 -/* DB431C 8024205C 00431023 */ subu $v0, $v0, $v1 -/* DB4320 80242060 000218C0 */ sll $v1, $v0, 3 -/* DB4324 80242064 00431021 */ addu $v0, $v0, $v1 -/* DB4328 80242068 000210C0 */ sll $v0, $v0, 3 -/* DB432C 8024206C 46001032 */ c.eq.s $f2, $f0 -/* DB4330 80242070 3C01800B */ lui $at, 0x800b -/* DB4334 80242074 00220821 */ addu $at, $at, $v0 -/* DB4338 80242078 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* DB433C 8024207C 45000005 */ bc1f .L80242094 -/* DB4340 80242080 00000000 */ nop -/* DB4344 80242084 3C0142C8 */ lui $at, 0x42c8 -/* DB4348 80242088 44810000 */ mtc1 $at, $f0 -/* DB434C 8024208C 08090829 */ j .L802420A4 -/* DB4350 80242090 4600B581 */ sub.s $f22, $f22, $f0 -.L80242094: -/* DB4354 80242094 3C0142C8 */ lui $at, 0x42c8 -/* DB4358 80242098 44810000 */ mtc1 $at, $f0 -/* DB435C 8024209C 00000000 */ nop -/* DB4360 802420A0 4600B580 */ add.s $f22, $f22, $f0 -.L802420A4: -/* DB4364 802420A4 0C00A6C9 */ jal clamp_angle -/* DB4368 802420A8 4600B306 */ mov.s $f12, $f22 -/* DB436C 802420AC 46000586 */ mov.s $f22, $f0 -/* DB4370 802420B0 3C014170 */ lui $at, 0x4170 -/* DB4374 802420B4 4481A000 */ mtc1 $at, $f20 -/* DB4378 802420B8 0C00A8BB */ jal sin_deg -/* DB437C 802420BC 4600B306 */ mov.s $f12, $f22 -/* DB4380 802420C0 46140002 */ mul.s $f0, $f0, $f20 -/* DB4384 802420C4 00000000 */ nop -/* DB4388 802420C8 864200B0 */ lh $v0, 0xb0($s2) -/* DB438C 802420CC 3C013F00 */ lui $at, 0x3f00 -/* DB4390 802420D0 44812000 */ mtc1 $at, $f4 -/* DB4394 802420D4 44821000 */ mtc1 $v0, $f2 -/* DB4398 802420D8 00000000 */ nop -/* DB439C 802420DC 468010A0 */ cvt.s.w $f2, $f2 -/* DB43A0 802420E0 46041082 */ mul.s $f2, $f2, $f4 -/* DB43A4 802420E4 00000000 */ nop -/* DB43A8 802420E8 4600E700 */ add.s $f28, $f28, $f0 -/* DB43AC 802420EC 4602D680 */ add.s $f26, $f26, $f2 -/* DB43B0 802420F0 0C00A8D4 */ jal cos_deg -/* DB43B4 802420F4 4600B306 */ mov.s $f12, $f22 -/* DB43B8 802420F8 46140002 */ mul.s $f0, $f0, $f20 -/* DB43BC 802420FC 00000000 */ nop -/* DB43C0 80242100 0220202D */ daddu $a0, $s1, $zero -/* DB43C4 80242104 0260282D */ daddu $a1, $s3, $zero -/* DB43C8 80242108 4600E18D */ trunc.w.s $f6, $f28 -/* DB43CC 8024210C 44063000 */ mfc1 $a2, $f6 -/* DB43D0 80242110 0C0B2026 */ jal set_variable -/* DB43D4 80242114 4600C601 */ sub.s $f24, $f24, $f0 -/* DB43D8 80242118 0220202D */ daddu $a0, $s1, $zero -/* DB43DC 8024211C 4600D18D */ trunc.w.s $f6, $f26 -/* DB43E0 80242120 44063000 */ mfc1 $a2, $f6 -/* DB43E4 80242124 0C0B2026 */ jal set_variable -/* DB43E8 80242128 0280282D */ daddu $a1, $s4, $zero -/* DB43EC 8024212C 0220202D */ daddu $a0, $s1, $zero -/* DB43F0 80242130 4600C18D */ trunc.w.s $f6, $f24 -/* DB43F4 80242134 44063000 */ mfc1 $a2, $f6 -/* DB43F8 80242138 0C0B2026 */ jal set_variable -/* DB43FC 8024213C 0200282D */ daddu $a1, $s0, $zero -/* DB4400 80242140 8FBF0024 */ lw $ra, 0x24($sp) -/* DB4404 80242144 8FB40020 */ lw $s4, 0x20($sp) -/* DB4408 80242148 8FB3001C */ lw $s3, 0x1c($sp) -/* DB440C 8024214C 8FB20018 */ lw $s2, 0x18($sp) -/* DB4410 80242150 8FB10014 */ lw $s1, 0x14($sp) -/* DB4414 80242154 8FB00010 */ lw $s0, 0x10($sp) -/* DB4418 80242158 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* DB441C 8024215C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* DB4420 80242160 D7B80038 */ ldc1 $f24, 0x38($sp) -/* DB4424 80242164 D7B60030 */ ldc1 $f22, 0x30($sp) -/* DB4428 80242168 D7B40028 */ ldc1 $f20, 0x28($sp) -/* DB442C 8024216C 24020002 */ addiu $v0, $zero, 2 -/* DB4430 80242170 03E00008 */ jr $ra -/* DB4434 80242174 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240D30_DE31C0.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240D30_DE31C0.s deleted file mode 100644 index a39e1dc133..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240D30_DE31C0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_DE31C0 -/* DE31C0 80240D30 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DE31C4 80240D34 AFB10014 */ sw $s1, 0x14($sp) -/* DE31C8 80240D38 0080882D */ daddu $s1, $a0, $zero -/* DE31CC 80240D3C AFBF0024 */ sw $ra, 0x24($sp) -/* DE31D0 80240D40 AFB40020 */ sw $s4, 0x20($sp) -/* DE31D4 80240D44 AFB3001C */ sw $s3, 0x1c($sp) -/* DE31D8 80240D48 AFB20018 */ sw $s2, 0x18($sp) -/* DE31DC 80240D4C AFB00010 */ sw $s0, 0x10($sp) -/* DE31E0 80240D50 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* DE31E4 80240D54 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* DE31E8 80240D58 F7B80038 */ sdc1 $f24, 0x38($sp) -/* DE31EC 80240D5C F7B60030 */ sdc1 $f22, 0x30($sp) -/* DE31F0 80240D60 F7B40028 */ sdc1 $f20, 0x28($sp) -/* DE31F4 80240D64 8E30000C */ lw $s0, 0xc($s1) -/* DE31F8 80240D68 8E130000 */ lw $s3, ($s0) -/* DE31FC 80240D6C 26100004 */ addiu $s0, $s0, 4 -/* DE3200 80240D70 0C0B1EAF */ jal get_variable -/* DE3204 80240D74 0260282D */ daddu $a1, $s3, $zero -/* DE3208 80240D78 4482E000 */ mtc1 $v0, $f28 -/* DE320C 80240D7C 00000000 */ nop -/* DE3210 80240D80 4680E720 */ cvt.s.w $f28, $f28 -/* DE3214 80240D84 8E140000 */ lw $s4, ($s0) -/* DE3218 80240D88 26100004 */ addiu $s0, $s0, 4 -/* DE321C 80240D8C 0220202D */ daddu $a0, $s1, $zero -/* DE3220 80240D90 0C0B1EAF */ jal get_variable -/* DE3224 80240D94 0280282D */ daddu $a1, $s4, $zero -/* DE3228 80240D98 4482D000 */ mtc1 $v0, $f26 -/* DE322C 80240D9C 00000000 */ nop -/* DE3230 80240DA0 4680D6A0 */ cvt.s.w $f26, $f26 -/* DE3234 80240DA4 8E100000 */ lw $s0, ($s0) -/* DE3238 80240DA8 0220202D */ daddu $a0, $s1, $zero -/* DE323C 80240DAC 0C0B1EAF */ jal get_variable -/* DE3240 80240DB0 0200282D */ daddu $a1, $s0, $zero -/* DE3244 80240DB4 4482C000 */ mtc1 $v0, $f24 -/* DE3248 80240DB8 00000000 */ nop -/* DE324C 80240DBC 4680C620 */ cvt.s.w $f24, $f24 -/* DE3250 80240DC0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* DE3254 80240DC4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* DE3258 80240DC8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* DE325C 80240DCC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* DE3260 80240DD0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* DE3264 80240DD4 44800000 */ mtc1 $zero, $f0 -/* DE3268 80240DD8 00031080 */ sll $v0, $v1, 2 -/* DE326C 80240DDC 00431021 */ addu $v0, $v0, $v1 -/* DE3270 80240DE0 00021080 */ sll $v0, $v0, 2 -/* DE3274 80240DE4 00431023 */ subu $v0, $v0, $v1 -/* DE3278 80240DE8 000218C0 */ sll $v1, $v0, 3 -/* DE327C 80240DEC 00431021 */ addu $v0, $v0, $v1 -/* DE3280 80240DF0 000210C0 */ sll $v0, $v0, 3 -/* DE3284 80240DF4 46001032 */ c.eq.s $f2, $f0 -/* DE3288 80240DF8 3C01800B */ lui $at, 0x800b -/* DE328C 80240DFC 00220821 */ addu $at, $at, $v0 -/* DE3290 80240E00 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* DE3294 80240E04 45000005 */ bc1f .L80240E1C -/* DE3298 80240E08 00000000 */ nop -/* DE329C 80240E0C 3C0142C8 */ lui $at, 0x42c8 -/* DE32A0 80240E10 44810000 */ mtc1 $at, $f0 -/* DE32A4 80240E14 0809038B */ j .L80240E2C -/* DE32A8 80240E18 4600B581 */ sub.s $f22, $f22, $f0 -.L80240E1C: -/* DE32AC 80240E1C 3C0142C8 */ lui $at, 0x42c8 -/* DE32B0 80240E20 44810000 */ mtc1 $at, $f0 -/* DE32B4 80240E24 00000000 */ nop -/* DE32B8 80240E28 4600B580 */ add.s $f22, $f22, $f0 -.L80240E2C: -/* DE32BC 80240E2C 0C00A6C9 */ jal clamp_angle -/* DE32C0 80240E30 4600B306 */ mov.s $f12, $f22 -/* DE32C4 80240E34 46000586 */ mov.s $f22, $f0 -/* DE32C8 80240E38 3C014170 */ lui $at, 0x4170 -/* DE32CC 80240E3C 4481A000 */ mtc1 $at, $f20 -/* DE32D0 80240E40 0C00A8BB */ jal sin_deg -/* DE32D4 80240E44 4600B306 */ mov.s $f12, $f22 -/* DE32D8 80240E48 46140002 */ mul.s $f0, $f0, $f20 -/* DE32DC 80240E4C 00000000 */ nop -/* DE32E0 80240E50 864200B0 */ lh $v0, 0xb0($s2) -/* DE32E4 80240E54 3C013F00 */ lui $at, 0x3f00 -/* DE32E8 80240E58 44812000 */ mtc1 $at, $f4 -/* DE32EC 80240E5C 44821000 */ mtc1 $v0, $f2 -/* DE32F0 80240E60 00000000 */ nop -/* DE32F4 80240E64 468010A0 */ cvt.s.w $f2, $f2 -/* DE32F8 80240E68 46041082 */ mul.s $f2, $f2, $f4 -/* DE32FC 80240E6C 00000000 */ nop -/* DE3300 80240E70 4600E700 */ add.s $f28, $f28, $f0 -/* DE3304 80240E74 4602D680 */ add.s $f26, $f26, $f2 -/* DE3308 80240E78 0C00A8D4 */ jal cos_deg -/* DE330C 80240E7C 4600B306 */ mov.s $f12, $f22 -/* DE3310 80240E80 46140002 */ mul.s $f0, $f0, $f20 -/* DE3314 80240E84 00000000 */ nop -/* DE3318 80240E88 0220202D */ daddu $a0, $s1, $zero -/* DE331C 80240E8C 0260282D */ daddu $a1, $s3, $zero -/* DE3320 80240E90 4600E18D */ trunc.w.s $f6, $f28 -/* DE3324 80240E94 44063000 */ mfc1 $a2, $f6 -/* DE3328 80240E98 0C0B2026 */ jal set_variable -/* DE332C 80240E9C 4600C601 */ sub.s $f24, $f24, $f0 -/* DE3330 80240EA0 0220202D */ daddu $a0, $s1, $zero -/* DE3334 80240EA4 4600D18D */ trunc.w.s $f6, $f26 -/* DE3338 80240EA8 44063000 */ mfc1 $a2, $f6 -/* DE333C 80240EAC 0C0B2026 */ jal set_variable -/* DE3340 80240EB0 0280282D */ daddu $a1, $s4, $zero -/* DE3344 80240EB4 0220202D */ daddu $a0, $s1, $zero -/* DE3348 80240EB8 4600C18D */ trunc.w.s $f6, $f24 -/* DE334C 80240EBC 44063000 */ mfc1 $a2, $f6 -/* DE3350 80240EC0 0C0B2026 */ jal set_variable -/* DE3354 80240EC4 0200282D */ daddu $a1, $s0, $zero -/* DE3358 80240EC8 8FBF0024 */ lw $ra, 0x24($sp) -/* DE335C 80240ECC 8FB40020 */ lw $s4, 0x20($sp) -/* DE3360 80240ED0 8FB3001C */ lw $s3, 0x1c($sp) -/* DE3364 80240ED4 8FB20018 */ lw $s2, 0x18($sp) -/* DE3368 80240ED8 8FB10014 */ lw $s1, 0x14($sp) -/* DE336C 80240EDC 8FB00010 */ lw $s0, 0x10($sp) -/* DE3370 80240EE0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* DE3374 80240EE4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* DE3378 80240EE8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* DE337C 80240EEC D7B60030 */ ldc1 $f22, 0x30($sp) -/* DE3380 80240EF0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* DE3384 80240EF4 24020002 */ addiu $v0, $zero, 2 -/* DE3388 80240EF8 03E00008 */ jr $ra -/* DE338C 80240EFC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802404D4_AB04C4.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802404D4_AB04C4.s deleted file mode 100644 index 6d12ca68f5..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802404D4_AB04C4.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D4_AB04C4 -/* AB04C4 802404D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AB04C8 802404D8 AFB10014 */ sw $s1, 0x14($sp) -/* AB04CC 802404DC 0080882D */ daddu $s1, $a0, $zero -/* AB04D0 802404E0 AFBF0024 */ sw $ra, 0x24($sp) -/* AB04D4 802404E4 AFB40020 */ sw $s4, 0x20($sp) -/* AB04D8 802404E8 AFB3001C */ sw $s3, 0x1c($sp) -/* AB04DC 802404EC AFB20018 */ sw $s2, 0x18($sp) -/* AB04E0 802404F0 AFB00010 */ sw $s0, 0x10($sp) -/* AB04E4 802404F4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* AB04E8 802404F8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* AB04EC 802404FC F7B80038 */ sdc1 $f24, 0x38($sp) -/* AB04F0 80240500 F7B60030 */ sdc1 $f22, 0x30($sp) -/* AB04F4 80240504 F7B40028 */ sdc1 $f20, 0x28($sp) -/* AB04F8 80240508 8E30000C */ lw $s0, 0xc($s1) -/* AB04FC 8024050C 8E130000 */ lw $s3, ($s0) -/* AB0500 80240510 26100004 */ addiu $s0, $s0, 4 -/* AB0504 80240514 0C0B1EAF */ jal get_variable -/* AB0508 80240518 0260282D */ daddu $a1, $s3, $zero -/* AB050C 8024051C 4482E000 */ mtc1 $v0, $f28 -/* AB0510 80240520 00000000 */ nop -/* AB0514 80240524 4680E720 */ cvt.s.w $f28, $f28 -/* AB0518 80240528 8E140000 */ lw $s4, ($s0) -/* AB051C 8024052C 26100004 */ addiu $s0, $s0, 4 -/* AB0520 80240530 0220202D */ daddu $a0, $s1, $zero -/* AB0524 80240534 0C0B1EAF */ jal get_variable -/* AB0528 80240538 0280282D */ daddu $a1, $s4, $zero -/* AB052C 8024053C 4482D000 */ mtc1 $v0, $f26 -/* AB0530 80240540 00000000 */ nop -/* AB0534 80240544 4680D6A0 */ cvt.s.w $f26, $f26 -/* AB0538 80240548 8E100000 */ lw $s0, ($s0) -/* AB053C 8024054C 0220202D */ daddu $a0, $s1, $zero -/* AB0540 80240550 0C0B1EAF */ jal get_variable -/* AB0544 80240554 0200282D */ daddu $a1, $s0, $zero -/* AB0548 80240558 4482C000 */ mtc1 $v0, $f24 -/* AB054C 8024055C 00000000 */ nop -/* AB0550 80240560 4680C620 */ cvt.s.w $f24, $f24 -/* AB0554 80240564 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AB0558 80240568 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AB055C 8024056C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* AB0560 80240570 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* AB0564 80240574 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* AB0568 80240578 44800000 */ mtc1 $zero, $f0 -/* AB056C 8024057C 00031080 */ sll $v0, $v1, 2 -/* AB0570 80240580 00431021 */ addu $v0, $v0, $v1 -/* AB0574 80240584 00021080 */ sll $v0, $v0, 2 -/* AB0578 80240588 00431023 */ subu $v0, $v0, $v1 -/* AB057C 8024058C 000218C0 */ sll $v1, $v0, 3 -/* AB0580 80240590 00431021 */ addu $v0, $v0, $v1 -/* AB0584 80240594 000210C0 */ sll $v0, $v0, 3 -/* AB0588 80240598 46001032 */ c.eq.s $f2, $f0 -/* AB058C 8024059C 3C01800B */ lui $at, 0x800b -/* AB0590 802405A0 00220821 */ addu $at, $at, $v0 -/* AB0594 802405A4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* AB0598 802405A8 45000005 */ bc1f .L802405C0 -/* AB059C 802405AC 00000000 */ nop -/* AB05A0 802405B0 3C0142C8 */ lui $at, 0x42c8 -/* AB05A4 802405B4 44810000 */ mtc1 $at, $f0 -/* AB05A8 802405B8 08090174 */ j .L802405D0 -/* AB05AC 802405BC 4600B581 */ sub.s $f22, $f22, $f0 -.L802405C0: -/* AB05B0 802405C0 3C0142C8 */ lui $at, 0x42c8 -/* AB05B4 802405C4 44810000 */ mtc1 $at, $f0 -/* AB05B8 802405C8 00000000 */ nop -/* AB05BC 802405CC 4600B580 */ add.s $f22, $f22, $f0 -.L802405D0: -/* AB05C0 802405D0 0C00A6C9 */ jal clamp_angle -/* AB05C4 802405D4 4600B306 */ mov.s $f12, $f22 -/* AB05C8 802405D8 46000586 */ mov.s $f22, $f0 -/* AB05CC 802405DC 3C014170 */ lui $at, 0x4170 -/* AB05D0 802405E0 4481A000 */ mtc1 $at, $f20 -/* AB05D4 802405E4 0C00A8BB */ jal sin_deg -/* AB05D8 802405E8 4600B306 */ mov.s $f12, $f22 -/* AB05DC 802405EC 46140002 */ mul.s $f0, $f0, $f20 -/* AB05E0 802405F0 00000000 */ nop -/* AB05E4 802405F4 864200B0 */ lh $v0, 0xb0($s2) -/* AB05E8 802405F8 3C013F00 */ lui $at, 0x3f00 -/* AB05EC 802405FC 44812000 */ mtc1 $at, $f4 -/* AB05F0 80240600 44821000 */ mtc1 $v0, $f2 -/* AB05F4 80240604 00000000 */ nop -/* AB05F8 80240608 468010A0 */ cvt.s.w $f2, $f2 -/* AB05FC 8024060C 46041082 */ mul.s $f2, $f2, $f4 -/* AB0600 80240610 00000000 */ nop -/* AB0604 80240614 4600E700 */ add.s $f28, $f28, $f0 -/* AB0608 80240618 4602D680 */ add.s $f26, $f26, $f2 -/* AB060C 8024061C 0C00A8D4 */ jal cos_deg -/* AB0610 80240620 4600B306 */ mov.s $f12, $f22 -/* AB0614 80240624 46140002 */ mul.s $f0, $f0, $f20 -/* AB0618 80240628 00000000 */ nop -/* AB061C 8024062C 0220202D */ daddu $a0, $s1, $zero -/* AB0620 80240630 0260282D */ daddu $a1, $s3, $zero -/* AB0624 80240634 4600E18D */ trunc.w.s $f6, $f28 -/* AB0628 80240638 44063000 */ mfc1 $a2, $f6 -/* AB062C 8024063C 0C0B2026 */ jal set_variable -/* AB0630 80240640 4600C601 */ sub.s $f24, $f24, $f0 -/* AB0634 80240644 0220202D */ daddu $a0, $s1, $zero -/* AB0638 80240648 4600D18D */ trunc.w.s $f6, $f26 -/* AB063C 8024064C 44063000 */ mfc1 $a2, $f6 -/* AB0640 80240650 0C0B2026 */ jal set_variable -/* AB0644 80240654 0280282D */ daddu $a1, $s4, $zero -/* AB0648 80240658 0220202D */ daddu $a0, $s1, $zero -/* AB064C 8024065C 4600C18D */ trunc.w.s $f6, $f24 -/* AB0650 80240660 44063000 */ mfc1 $a2, $f6 -/* AB0654 80240664 0C0B2026 */ jal set_variable -/* AB0658 80240668 0200282D */ daddu $a1, $s0, $zero -/* AB065C 8024066C 8FBF0024 */ lw $ra, 0x24($sp) -/* AB0660 80240670 8FB40020 */ lw $s4, 0x20($sp) -/* AB0664 80240674 8FB3001C */ lw $s3, 0x1c($sp) -/* AB0668 80240678 8FB20018 */ lw $s2, 0x18($sp) -/* AB066C 8024067C 8FB10014 */ lw $s1, 0x14($sp) -/* AB0670 80240680 8FB00010 */ lw $s0, 0x10($sp) -/* AB0674 80240684 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* AB0678 80240688 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* AB067C 8024068C D7B80038 */ ldc1 $f24, 0x38($sp) -/* AB0680 80240690 D7B60030 */ ldc1 $f22, 0x30($sp) -/* AB0684 80240694 D7B40028 */ ldc1 $f20, 0x28($sp) -/* AB0688 80240698 24020002 */ addiu $v0, $zero, 2 -/* AB068C 8024069C 03E00008 */ jr $ra -/* AB0690 802406A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240FDC_D4E01C.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240FDC_D4E01C.s deleted file mode 100644 index f753860e65..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240FDC_D4E01C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FDC_D4E01C -/* D4E01C 80240FDC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D4E020 80240FE0 AFB10014 */ sw $s1, 0x14($sp) -/* D4E024 80240FE4 0080882D */ daddu $s1, $a0, $zero -/* D4E028 80240FE8 AFBF0024 */ sw $ra, 0x24($sp) -/* D4E02C 80240FEC AFB40020 */ sw $s4, 0x20($sp) -/* D4E030 80240FF0 AFB3001C */ sw $s3, 0x1c($sp) -/* D4E034 80240FF4 AFB20018 */ sw $s2, 0x18($sp) -/* D4E038 80240FF8 AFB00010 */ sw $s0, 0x10($sp) -/* D4E03C 80240FFC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D4E040 80241000 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D4E044 80241004 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D4E048 80241008 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D4E04C 8024100C F7B40028 */ sdc1 $f20, 0x28($sp) -/* D4E050 80241010 8E30000C */ lw $s0, 0xc($s1) -/* D4E054 80241014 8E130000 */ lw $s3, ($s0) -/* D4E058 80241018 26100004 */ addiu $s0, $s0, 4 -/* D4E05C 8024101C 0C0B1EAF */ jal get_variable -/* D4E060 80241020 0260282D */ daddu $a1, $s3, $zero -/* D4E064 80241024 4482E000 */ mtc1 $v0, $f28 -/* D4E068 80241028 00000000 */ nop -/* D4E06C 8024102C 4680E720 */ cvt.s.w $f28, $f28 -/* D4E070 80241030 8E140000 */ lw $s4, ($s0) -/* D4E074 80241034 26100004 */ addiu $s0, $s0, 4 -/* D4E078 80241038 0220202D */ daddu $a0, $s1, $zero -/* D4E07C 8024103C 0C0B1EAF */ jal get_variable -/* D4E080 80241040 0280282D */ daddu $a1, $s4, $zero -/* D4E084 80241044 4482D000 */ mtc1 $v0, $f26 -/* D4E088 80241048 00000000 */ nop -/* D4E08C 8024104C 4680D6A0 */ cvt.s.w $f26, $f26 -/* D4E090 80241050 8E100000 */ lw $s0, ($s0) -/* D4E094 80241054 0220202D */ daddu $a0, $s1, $zero -/* D4E098 80241058 0C0B1EAF */ jal get_variable -/* D4E09C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* D4E0A0 80241060 4482C000 */ mtc1 $v0, $f24 -/* D4E0A4 80241064 00000000 */ nop -/* D4E0A8 80241068 4680C620 */ cvt.s.w $f24, $f24 -/* D4E0AC 8024106C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D4E0B0 80241070 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D4E0B4 80241074 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D4E0B8 80241078 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D4E0BC 8024107C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D4E0C0 80241080 44800000 */ mtc1 $zero, $f0 -/* D4E0C4 80241084 00031080 */ sll $v0, $v1, 2 -/* D4E0C8 80241088 00431021 */ addu $v0, $v0, $v1 -/* D4E0CC 8024108C 00021080 */ sll $v0, $v0, 2 -/* D4E0D0 80241090 00431023 */ subu $v0, $v0, $v1 -/* D4E0D4 80241094 000218C0 */ sll $v1, $v0, 3 -/* D4E0D8 80241098 00431021 */ addu $v0, $v0, $v1 -/* D4E0DC 8024109C 000210C0 */ sll $v0, $v0, 3 -/* D4E0E0 802410A0 46001032 */ c.eq.s $f2, $f0 -/* D4E0E4 802410A4 3C01800B */ lui $at, 0x800b -/* D4E0E8 802410A8 00220821 */ addu $at, $at, $v0 -/* D4E0EC 802410AC C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D4E0F0 802410B0 45000005 */ bc1f .L802410C8 -/* D4E0F4 802410B4 00000000 */ nop -/* D4E0F8 802410B8 3C0142C8 */ lui $at, 0x42c8 -/* D4E0FC 802410BC 44810000 */ mtc1 $at, $f0 -/* D4E100 802410C0 08090436 */ j .L802410D8 -/* D4E104 802410C4 4600B581 */ sub.s $f22, $f22, $f0 -.L802410C8: -/* D4E108 802410C8 3C0142C8 */ lui $at, 0x42c8 -/* D4E10C 802410CC 44810000 */ mtc1 $at, $f0 -/* D4E110 802410D0 00000000 */ nop -/* D4E114 802410D4 4600B580 */ add.s $f22, $f22, $f0 -.L802410D8: -/* D4E118 802410D8 0C00A6C9 */ jal clamp_angle -/* D4E11C 802410DC 4600B306 */ mov.s $f12, $f22 -/* D4E120 802410E0 46000586 */ mov.s $f22, $f0 -/* D4E124 802410E4 3C014170 */ lui $at, 0x4170 -/* D4E128 802410E8 4481A000 */ mtc1 $at, $f20 -/* D4E12C 802410EC 0C00A8BB */ jal sin_deg -/* D4E130 802410F0 4600B306 */ mov.s $f12, $f22 -/* D4E134 802410F4 46140002 */ mul.s $f0, $f0, $f20 -/* D4E138 802410F8 00000000 */ nop -/* D4E13C 802410FC 864200B0 */ lh $v0, 0xb0($s2) -/* D4E140 80241100 3C013F00 */ lui $at, 0x3f00 -/* D4E144 80241104 44812000 */ mtc1 $at, $f4 -/* D4E148 80241108 44821000 */ mtc1 $v0, $f2 -/* D4E14C 8024110C 00000000 */ nop -/* D4E150 80241110 468010A0 */ cvt.s.w $f2, $f2 -/* D4E154 80241114 46041082 */ mul.s $f2, $f2, $f4 -/* D4E158 80241118 00000000 */ nop -/* D4E15C 8024111C 4600E700 */ add.s $f28, $f28, $f0 -/* D4E160 80241120 4602D680 */ add.s $f26, $f26, $f2 -/* D4E164 80241124 0C00A8D4 */ jal cos_deg -/* D4E168 80241128 4600B306 */ mov.s $f12, $f22 -/* D4E16C 8024112C 46140002 */ mul.s $f0, $f0, $f20 -/* D4E170 80241130 00000000 */ nop -/* D4E174 80241134 0220202D */ daddu $a0, $s1, $zero -/* D4E178 80241138 0260282D */ daddu $a1, $s3, $zero -/* D4E17C 8024113C 4600E18D */ trunc.w.s $f6, $f28 -/* D4E180 80241140 44063000 */ mfc1 $a2, $f6 -/* D4E184 80241144 0C0B2026 */ jal set_variable -/* D4E188 80241148 4600C601 */ sub.s $f24, $f24, $f0 -/* D4E18C 8024114C 0220202D */ daddu $a0, $s1, $zero -/* D4E190 80241150 4600D18D */ trunc.w.s $f6, $f26 -/* D4E194 80241154 44063000 */ mfc1 $a2, $f6 -/* D4E198 80241158 0C0B2026 */ jal set_variable -/* D4E19C 8024115C 0280282D */ daddu $a1, $s4, $zero -/* D4E1A0 80241160 0220202D */ daddu $a0, $s1, $zero -/* D4E1A4 80241164 4600C18D */ trunc.w.s $f6, $f24 -/* D4E1A8 80241168 44063000 */ mfc1 $a2, $f6 -/* D4E1AC 8024116C 0C0B2026 */ jal set_variable -/* D4E1B0 80241170 0200282D */ daddu $a1, $s0, $zero -/* D4E1B4 80241174 8FBF0024 */ lw $ra, 0x24($sp) -/* D4E1B8 80241178 8FB40020 */ lw $s4, 0x20($sp) -/* D4E1BC 8024117C 8FB3001C */ lw $s3, 0x1c($sp) -/* D4E1C0 80241180 8FB20018 */ lw $s2, 0x18($sp) -/* D4E1C4 80241184 8FB10014 */ lw $s1, 0x14($sp) -/* D4E1C8 80241188 8FB00010 */ lw $s0, 0x10($sp) -/* D4E1CC 8024118C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D4E1D0 80241190 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D4E1D4 80241194 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D4E1D8 80241198 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D4E1DC 8024119C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D4E1E0 802411A0 24020002 */ addiu $v0, $zero, 2 -/* D4E1E4 802411A4 03E00008 */ jr $ra -/* D4E1E8 802411A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240F7C_D50F6C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240F7C_D50F6C.s deleted file mode 100644 index 93e80c3516..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240F7C_D50F6C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_D50F6C -/* D50F6C 80240F7C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D50F70 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* D50F74 80240F84 0080882D */ daddu $s1, $a0, $zero -/* D50F78 80240F88 AFBF0024 */ sw $ra, 0x24($sp) -/* D50F7C 80240F8C AFB40020 */ sw $s4, 0x20($sp) -/* D50F80 80240F90 AFB3001C */ sw $s3, 0x1c($sp) -/* D50F84 80240F94 AFB20018 */ sw $s2, 0x18($sp) -/* D50F88 80240F98 AFB00010 */ sw $s0, 0x10($sp) -/* D50F8C 80240F9C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D50F90 80240FA0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D50F94 80240FA4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D50F98 80240FA8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D50F9C 80240FAC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D50FA0 80240FB0 8E30000C */ lw $s0, 0xc($s1) -/* D50FA4 80240FB4 8E130000 */ lw $s3, ($s0) -/* D50FA8 80240FB8 26100004 */ addiu $s0, $s0, 4 -/* D50FAC 80240FBC 0C0B1EAF */ jal get_variable -/* D50FB0 80240FC0 0260282D */ daddu $a1, $s3, $zero -/* D50FB4 80240FC4 4482E000 */ mtc1 $v0, $f28 -/* D50FB8 80240FC8 00000000 */ nop -/* D50FBC 80240FCC 4680E720 */ cvt.s.w $f28, $f28 -/* D50FC0 80240FD0 8E140000 */ lw $s4, ($s0) -/* D50FC4 80240FD4 26100004 */ addiu $s0, $s0, 4 -/* D50FC8 80240FD8 0220202D */ daddu $a0, $s1, $zero -/* D50FCC 80240FDC 0C0B1EAF */ jal get_variable -/* D50FD0 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* D50FD4 80240FE4 4482D000 */ mtc1 $v0, $f26 -/* D50FD8 80240FE8 00000000 */ nop -/* D50FDC 80240FEC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D50FE0 80240FF0 8E100000 */ lw $s0, ($s0) -/* D50FE4 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* D50FE8 80240FF8 0C0B1EAF */ jal get_variable -/* D50FEC 80240FFC 0200282D */ daddu $a1, $s0, $zero -/* D50FF0 80241000 4482C000 */ mtc1 $v0, $f24 -/* D50FF4 80241004 00000000 */ nop -/* D50FF8 80241008 4680C620 */ cvt.s.w $f24, $f24 -/* D50FFC 8024100C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D51000 80241010 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D51004 80241014 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D51008 80241018 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D5100C 8024101C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D51010 80241020 44800000 */ mtc1 $zero, $f0 -/* D51014 80241024 00031080 */ sll $v0, $v1, 2 -/* D51018 80241028 00431021 */ addu $v0, $v0, $v1 -/* D5101C 8024102C 00021080 */ sll $v0, $v0, 2 -/* D51020 80241030 00431023 */ subu $v0, $v0, $v1 -/* D51024 80241034 000218C0 */ sll $v1, $v0, 3 -/* D51028 80241038 00431021 */ addu $v0, $v0, $v1 -/* D5102C 8024103C 000210C0 */ sll $v0, $v0, 3 -/* D51030 80241040 46001032 */ c.eq.s $f2, $f0 -/* D51034 80241044 3C01800B */ lui $at, 0x800b -/* D51038 80241048 00220821 */ addu $at, $at, $v0 -/* D5103C 8024104C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D51040 80241050 45000005 */ bc1f .L80241068 -/* D51044 80241054 00000000 */ nop -/* D51048 80241058 3C0142C8 */ lui $at, 0x42c8 -/* D5104C 8024105C 44810000 */ mtc1 $at, $f0 -/* D51050 80241060 0809041E */ j .L80241078 -/* D51054 80241064 4600B581 */ sub.s $f22, $f22, $f0 -.L80241068: -/* D51058 80241068 3C0142C8 */ lui $at, 0x42c8 -/* D5105C 8024106C 44810000 */ mtc1 $at, $f0 -/* D51060 80241070 00000000 */ nop -/* D51064 80241074 4600B580 */ add.s $f22, $f22, $f0 -.L80241078: -/* D51068 80241078 0C00A6C9 */ jal clamp_angle -/* D5106C 8024107C 4600B306 */ mov.s $f12, $f22 -/* D51070 80241080 46000586 */ mov.s $f22, $f0 -/* D51074 80241084 3C014170 */ lui $at, 0x4170 -/* D51078 80241088 4481A000 */ mtc1 $at, $f20 -/* D5107C 8024108C 0C00A8BB */ jal sin_deg -/* D51080 80241090 4600B306 */ mov.s $f12, $f22 -/* D51084 80241094 46140002 */ mul.s $f0, $f0, $f20 -/* D51088 80241098 00000000 */ nop -/* D5108C 8024109C 864200B0 */ lh $v0, 0xb0($s2) -/* D51090 802410A0 3C013F00 */ lui $at, 0x3f00 -/* D51094 802410A4 44812000 */ mtc1 $at, $f4 -/* D51098 802410A8 44821000 */ mtc1 $v0, $f2 -/* D5109C 802410AC 00000000 */ nop -/* D510A0 802410B0 468010A0 */ cvt.s.w $f2, $f2 -/* D510A4 802410B4 46041082 */ mul.s $f2, $f2, $f4 -/* D510A8 802410B8 00000000 */ nop -/* D510AC 802410BC 4600E700 */ add.s $f28, $f28, $f0 -/* D510B0 802410C0 4602D680 */ add.s $f26, $f26, $f2 -/* D510B4 802410C4 0C00A8D4 */ jal cos_deg -/* D510B8 802410C8 4600B306 */ mov.s $f12, $f22 -/* D510BC 802410CC 46140002 */ mul.s $f0, $f0, $f20 -/* D510C0 802410D0 00000000 */ nop -/* D510C4 802410D4 0220202D */ daddu $a0, $s1, $zero -/* D510C8 802410D8 0260282D */ daddu $a1, $s3, $zero -/* D510CC 802410DC 4600E18D */ trunc.w.s $f6, $f28 -/* D510D0 802410E0 44063000 */ mfc1 $a2, $f6 -/* D510D4 802410E4 0C0B2026 */ jal set_variable -/* D510D8 802410E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D510DC 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D510E0 802410F0 4600D18D */ trunc.w.s $f6, $f26 -/* D510E4 802410F4 44063000 */ mfc1 $a2, $f6 -/* D510E8 802410F8 0C0B2026 */ jal set_variable -/* D510EC 802410FC 0280282D */ daddu $a1, $s4, $zero -/* D510F0 80241100 0220202D */ daddu $a0, $s1, $zero -/* D510F4 80241104 4600C18D */ trunc.w.s $f6, $f24 -/* D510F8 80241108 44063000 */ mfc1 $a2, $f6 -/* D510FC 8024110C 0C0B2026 */ jal set_variable -/* D51100 80241110 0200282D */ daddu $a1, $s0, $zero -/* D51104 80241114 8FBF0024 */ lw $ra, 0x24($sp) -/* D51108 80241118 8FB40020 */ lw $s4, 0x20($sp) -/* D5110C 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* D51110 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* D51114 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* D51118 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* D5111C 8024112C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D51120 80241130 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D51124 80241134 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D51128 80241138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D5112C 8024113C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D51130 80241140 24020002 */ addiu $v0, $zero, 2 -/* D51134 80241144 03E00008 */ jr $ra -/* D51138 80241148 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240F7C_D5980C.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240F7C_D5980C.s deleted file mode 100644 index e7bfb81610..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240F7C_D5980C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_D5980C -/* D5980C 80240F7C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D59810 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* D59814 80240F84 0080882D */ daddu $s1, $a0, $zero -/* D59818 80240F88 AFBF0024 */ sw $ra, 0x24($sp) -/* D5981C 80240F8C AFB40020 */ sw $s4, 0x20($sp) -/* D59820 80240F90 AFB3001C */ sw $s3, 0x1c($sp) -/* D59824 80240F94 AFB20018 */ sw $s2, 0x18($sp) -/* D59828 80240F98 AFB00010 */ sw $s0, 0x10($sp) -/* D5982C 80240F9C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D59830 80240FA0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D59834 80240FA4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D59838 80240FA8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D5983C 80240FAC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D59840 80240FB0 8E30000C */ lw $s0, 0xc($s1) -/* D59844 80240FB4 8E130000 */ lw $s3, ($s0) -/* D59848 80240FB8 26100004 */ addiu $s0, $s0, 4 -/* D5984C 80240FBC 0C0B1EAF */ jal get_variable -/* D59850 80240FC0 0260282D */ daddu $a1, $s3, $zero -/* D59854 80240FC4 4482E000 */ mtc1 $v0, $f28 -/* D59858 80240FC8 00000000 */ nop -/* D5985C 80240FCC 4680E720 */ cvt.s.w $f28, $f28 -/* D59860 80240FD0 8E140000 */ lw $s4, ($s0) -/* D59864 80240FD4 26100004 */ addiu $s0, $s0, 4 -/* D59868 80240FD8 0220202D */ daddu $a0, $s1, $zero -/* D5986C 80240FDC 0C0B1EAF */ jal get_variable -/* D59870 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* D59874 80240FE4 4482D000 */ mtc1 $v0, $f26 -/* D59878 80240FE8 00000000 */ nop -/* D5987C 80240FEC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D59880 80240FF0 8E100000 */ lw $s0, ($s0) -/* D59884 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* D59888 80240FF8 0C0B1EAF */ jal get_variable -/* D5988C 80240FFC 0200282D */ daddu $a1, $s0, $zero -/* D59890 80241000 4482C000 */ mtc1 $v0, $f24 -/* D59894 80241004 00000000 */ nop -/* D59898 80241008 4680C620 */ cvt.s.w $f24, $f24 -/* D5989C 8024100C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D598A0 80241010 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D598A4 80241014 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D598A8 80241018 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D598AC 8024101C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D598B0 80241020 44800000 */ mtc1 $zero, $f0 -/* D598B4 80241024 00031080 */ sll $v0, $v1, 2 -/* D598B8 80241028 00431021 */ addu $v0, $v0, $v1 -/* D598BC 8024102C 00021080 */ sll $v0, $v0, 2 -/* D598C0 80241030 00431023 */ subu $v0, $v0, $v1 -/* D598C4 80241034 000218C0 */ sll $v1, $v0, 3 -/* D598C8 80241038 00431021 */ addu $v0, $v0, $v1 -/* D598CC 8024103C 000210C0 */ sll $v0, $v0, 3 -/* D598D0 80241040 46001032 */ c.eq.s $f2, $f0 -/* D598D4 80241044 3C01800B */ lui $at, 0x800b -/* D598D8 80241048 00220821 */ addu $at, $at, $v0 -/* D598DC 8024104C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D598E0 80241050 45000005 */ bc1f .L80241068 -/* D598E4 80241054 00000000 */ nop -/* D598E8 80241058 3C0142C8 */ lui $at, 0x42c8 -/* D598EC 8024105C 44810000 */ mtc1 $at, $f0 -/* D598F0 80241060 0809041E */ j .L80241078 -/* D598F4 80241064 4600B581 */ sub.s $f22, $f22, $f0 -.L80241068: -/* D598F8 80241068 3C0142C8 */ lui $at, 0x42c8 -/* D598FC 8024106C 44810000 */ mtc1 $at, $f0 -/* D59900 80241070 00000000 */ nop -/* D59904 80241074 4600B580 */ add.s $f22, $f22, $f0 -.L80241078: -/* D59908 80241078 0C00A6C9 */ jal clamp_angle -/* D5990C 8024107C 4600B306 */ mov.s $f12, $f22 -/* D59910 80241080 46000586 */ mov.s $f22, $f0 -/* D59914 80241084 3C014170 */ lui $at, 0x4170 -/* D59918 80241088 4481A000 */ mtc1 $at, $f20 -/* D5991C 8024108C 0C00A8BB */ jal sin_deg -/* D59920 80241090 4600B306 */ mov.s $f12, $f22 -/* D59924 80241094 46140002 */ mul.s $f0, $f0, $f20 -/* D59928 80241098 00000000 */ nop -/* D5992C 8024109C 864200B0 */ lh $v0, 0xb0($s2) -/* D59930 802410A0 3C013F00 */ lui $at, 0x3f00 -/* D59934 802410A4 44812000 */ mtc1 $at, $f4 -/* D59938 802410A8 44821000 */ mtc1 $v0, $f2 -/* D5993C 802410AC 00000000 */ nop -/* D59940 802410B0 468010A0 */ cvt.s.w $f2, $f2 -/* D59944 802410B4 46041082 */ mul.s $f2, $f2, $f4 -/* D59948 802410B8 00000000 */ nop -/* D5994C 802410BC 4600E700 */ add.s $f28, $f28, $f0 -/* D59950 802410C0 4602D680 */ add.s $f26, $f26, $f2 -/* D59954 802410C4 0C00A8D4 */ jal cos_deg -/* D59958 802410C8 4600B306 */ mov.s $f12, $f22 -/* D5995C 802410CC 46140002 */ mul.s $f0, $f0, $f20 -/* D59960 802410D0 00000000 */ nop -/* D59964 802410D4 0220202D */ daddu $a0, $s1, $zero -/* D59968 802410D8 0260282D */ daddu $a1, $s3, $zero -/* D5996C 802410DC 4600E18D */ trunc.w.s $f6, $f28 -/* D59970 802410E0 44063000 */ mfc1 $a2, $f6 -/* D59974 802410E4 0C0B2026 */ jal set_variable -/* D59978 802410E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D5997C 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D59980 802410F0 4600D18D */ trunc.w.s $f6, $f26 -/* D59984 802410F4 44063000 */ mfc1 $a2, $f6 -/* D59988 802410F8 0C0B2026 */ jal set_variable -/* D5998C 802410FC 0280282D */ daddu $a1, $s4, $zero -/* D59990 80241100 0220202D */ daddu $a0, $s1, $zero -/* D59994 80241104 4600C18D */ trunc.w.s $f6, $f24 -/* D59998 80241108 44063000 */ mfc1 $a2, $f6 -/* D5999C 8024110C 0C0B2026 */ jal set_variable -/* D599A0 80241110 0200282D */ daddu $a1, $s0, $zero -/* D599A4 80241114 8FBF0024 */ lw $ra, 0x24($sp) -/* D599A8 80241118 8FB40020 */ lw $s4, 0x20($sp) -/* D599AC 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* D599B0 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* D599B4 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* D599B8 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* D599BC 8024112C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D599C0 80241130 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D599C4 80241134 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D599C8 80241138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D599CC 8024113C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D599D0 80241140 24020002 */ addiu $v0, $zero, 2 -/* D599D4 80241144 03E00008 */ jr $ra -/* D599D8 80241148 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240F7C_D6555C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240F7C_D6555C.s deleted file mode 100644 index 3f47a5ed3c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240F7C_D6555C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_D6555C -/* D6555C 80240F7C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D65560 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* D65564 80240F84 0080882D */ daddu $s1, $a0, $zero -/* D65568 80240F88 AFBF0024 */ sw $ra, 0x24($sp) -/* D6556C 80240F8C AFB40020 */ sw $s4, 0x20($sp) -/* D65570 80240F90 AFB3001C */ sw $s3, 0x1c($sp) -/* D65574 80240F94 AFB20018 */ sw $s2, 0x18($sp) -/* D65578 80240F98 AFB00010 */ sw $s0, 0x10($sp) -/* D6557C 80240F9C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D65580 80240FA0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D65584 80240FA4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D65588 80240FA8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D6558C 80240FAC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D65590 80240FB0 8E30000C */ lw $s0, 0xc($s1) -/* D65594 80240FB4 8E130000 */ lw $s3, ($s0) -/* D65598 80240FB8 26100004 */ addiu $s0, $s0, 4 -/* D6559C 80240FBC 0C0B1EAF */ jal get_variable -/* D655A0 80240FC0 0260282D */ daddu $a1, $s3, $zero -/* D655A4 80240FC4 4482E000 */ mtc1 $v0, $f28 -/* D655A8 80240FC8 00000000 */ nop -/* D655AC 80240FCC 4680E720 */ cvt.s.w $f28, $f28 -/* D655B0 80240FD0 8E140000 */ lw $s4, ($s0) -/* D655B4 80240FD4 26100004 */ addiu $s0, $s0, 4 -/* D655B8 80240FD8 0220202D */ daddu $a0, $s1, $zero -/* D655BC 80240FDC 0C0B1EAF */ jal get_variable -/* D655C0 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* D655C4 80240FE4 4482D000 */ mtc1 $v0, $f26 -/* D655C8 80240FE8 00000000 */ nop -/* D655CC 80240FEC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D655D0 80240FF0 8E100000 */ lw $s0, ($s0) -/* D655D4 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* D655D8 80240FF8 0C0B1EAF */ jal get_variable -/* D655DC 80240FFC 0200282D */ daddu $a1, $s0, $zero -/* D655E0 80241000 4482C000 */ mtc1 $v0, $f24 -/* D655E4 80241004 00000000 */ nop -/* D655E8 80241008 4680C620 */ cvt.s.w $f24, $f24 -/* D655EC 8024100C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D655F0 80241010 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D655F4 80241014 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D655F8 80241018 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D655FC 8024101C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D65600 80241020 44800000 */ mtc1 $zero, $f0 -/* D65604 80241024 00031080 */ sll $v0, $v1, 2 -/* D65608 80241028 00431021 */ addu $v0, $v0, $v1 -/* D6560C 8024102C 00021080 */ sll $v0, $v0, 2 -/* D65610 80241030 00431023 */ subu $v0, $v0, $v1 -/* D65614 80241034 000218C0 */ sll $v1, $v0, 3 -/* D65618 80241038 00431021 */ addu $v0, $v0, $v1 -/* D6561C 8024103C 000210C0 */ sll $v0, $v0, 3 -/* D65620 80241040 46001032 */ c.eq.s $f2, $f0 -/* D65624 80241044 3C01800B */ lui $at, 0x800b -/* D65628 80241048 00220821 */ addu $at, $at, $v0 -/* D6562C 8024104C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D65630 80241050 45000005 */ bc1f .L80241068 -/* D65634 80241054 00000000 */ nop -/* D65638 80241058 3C0142C8 */ lui $at, 0x42c8 -/* D6563C 8024105C 44810000 */ mtc1 $at, $f0 -/* D65640 80241060 0809041E */ j .L80241078 -/* D65644 80241064 4600B581 */ sub.s $f22, $f22, $f0 -.L80241068: -/* D65648 80241068 3C0142C8 */ lui $at, 0x42c8 -/* D6564C 8024106C 44810000 */ mtc1 $at, $f0 -/* D65650 80241070 00000000 */ nop -/* D65654 80241074 4600B580 */ add.s $f22, $f22, $f0 -.L80241078: -/* D65658 80241078 0C00A6C9 */ jal clamp_angle -/* D6565C 8024107C 4600B306 */ mov.s $f12, $f22 -/* D65660 80241080 46000586 */ mov.s $f22, $f0 -/* D65664 80241084 3C014170 */ lui $at, 0x4170 -/* D65668 80241088 4481A000 */ mtc1 $at, $f20 -/* D6566C 8024108C 0C00A8BB */ jal sin_deg -/* D65670 80241090 4600B306 */ mov.s $f12, $f22 -/* D65674 80241094 46140002 */ mul.s $f0, $f0, $f20 -/* D65678 80241098 00000000 */ nop -/* D6567C 8024109C 864200B0 */ lh $v0, 0xb0($s2) -/* D65680 802410A0 3C013F00 */ lui $at, 0x3f00 -/* D65684 802410A4 44812000 */ mtc1 $at, $f4 -/* D65688 802410A8 44821000 */ mtc1 $v0, $f2 -/* D6568C 802410AC 00000000 */ nop -/* D65690 802410B0 468010A0 */ cvt.s.w $f2, $f2 -/* D65694 802410B4 46041082 */ mul.s $f2, $f2, $f4 -/* D65698 802410B8 00000000 */ nop -/* D6569C 802410BC 4600E700 */ add.s $f28, $f28, $f0 -/* D656A0 802410C0 4602D680 */ add.s $f26, $f26, $f2 -/* D656A4 802410C4 0C00A8D4 */ jal cos_deg -/* D656A8 802410C8 4600B306 */ mov.s $f12, $f22 -/* D656AC 802410CC 46140002 */ mul.s $f0, $f0, $f20 -/* D656B0 802410D0 00000000 */ nop -/* D656B4 802410D4 0220202D */ daddu $a0, $s1, $zero -/* D656B8 802410D8 0260282D */ daddu $a1, $s3, $zero -/* D656BC 802410DC 4600E18D */ trunc.w.s $f6, $f28 -/* D656C0 802410E0 44063000 */ mfc1 $a2, $f6 -/* D656C4 802410E4 0C0B2026 */ jal set_variable -/* D656C8 802410E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D656CC 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D656D0 802410F0 4600D18D */ trunc.w.s $f6, $f26 -/* D656D4 802410F4 44063000 */ mfc1 $a2, $f6 -/* D656D8 802410F8 0C0B2026 */ jal set_variable -/* D656DC 802410FC 0280282D */ daddu $a1, $s4, $zero -/* D656E0 80241100 0220202D */ daddu $a0, $s1, $zero -/* D656E4 80241104 4600C18D */ trunc.w.s $f6, $f24 -/* D656E8 80241108 44063000 */ mfc1 $a2, $f6 -/* D656EC 8024110C 0C0B2026 */ jal set_variable -/* D656F0 80241110 0200282D */ daddu $a1, $s0, $zero -/* D656F4 80241114 8FBF0024 */ lw $ra, 0x24($sp) -/* D656F8 80241118 8FB40020 */ lw $s4, 0x20($sp) -/* D656FC 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* D65700 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* D65704 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* D65708 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* D6570C 8024112C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D65710 80241130 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D65714 80241134 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D65718 80241138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D6571C 8024113C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D65720 80241140 24020002 */ addiu $v0, $zero, 2 -/* D65724 80241144 03E00008 */ jr $ra -/* D65728 80241148 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240F7C_D6F92C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240F7C_D6F92C.s deleted file mode 100644 index e9c2b0c0e7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240F7C_D6F92C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_D6F92C -/* D6F92C 80240F7C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6F930 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* D6F934 80240F84 0080882D */ daddu $s1, $a0, $zero -/* D6F938 80240F88 AFBF0024 */ sw $ra, 0x24($sp) -/* D6F93C 80240F8C AFB40020 */ sw $s4, 0x20($sp) -/* D6F940 80240F90 AFB3001C */ sw $s3, 0x1c($sp) -/* D6F944 80240F94 AFB20018 */ sw $s2, 0x18($sp) -/* D6F948 80240F98 AFB00010 */ sw $s0, 0x10($sp) -/* D6F94C 80240F9C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D6F950 80240FA0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D6F954 80240FA4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D6F958 80240FA8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D6F95C 80240FAC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D6F960 80240FB0 8E30000C */ lw $s0, 0xc($s1) -/* D6F964 80240FB4 8E130000 */ lw $s3, ($s0) -/* D6F968 80240FB8 26100004 */ addiu $s0, $s0, 4 -/* D6F96C 80240FBC 0C0B1EAF */ jal get_variable -/* D6F970 80240FC0 0260282D */ daddu $a1, $s3, $zero -/* D6F974 80240FC4 4482E000 */ mtc1 $v0, $f28 -/* D6F978 80240FC8 00000000 */ nop -/* D6F97C 80240FCC 4680E720 */ cvt.s.w $f28, $f28 -/* D6F980 80240FD0 8E140000 */ lw $s4, ($s0) -/* D6F984 80240FD4 26100004 */ addiu $s0, $s0, 4 -/* D6F988 80240FD8 0220202D */ daddu $a0, $s1, $zero -/* D6F98C 80240FDC 0C0B1EAF */ jal get_variable -/* D6F990 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* D6F994 80240FE4 4482D000 */ mtc1 $v0, $f26 -/* D6F998 80240FE8 00000000 */ nop -/* D6F99C 80240FEC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D6F9A0 80240FF0 8E100000 */ lw $s0, ($s0) -/* D6F9A4 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* D6F9A8 80240FF8 0C0B1EAF */ jal get_variable -/* D6F9AC 80240FFC 0200282D */ daddu $a1, $s0, $zero -/* D6F9B0 80241000 4482C000 */ mtc1 $v0, $f24 -/* D6F9B4 80241004 00000000 */ nop -/* D6F9B8 80241008 4680C620 */ cvt.s.w $f24, $f24 -/* D6F9BC 8024100C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D6F9C0 80241010 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D6F9C4 80241014 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D6F9C8 80241018 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D6F9CC 8024101C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D6F9D0 80241020 44800000 */ mtc1 $zero, $f0 -/* D6F9D4 80241024 00031080 */ sll $v0, $v1, 2 -/* D6F9D8 80241028 00431021 */ addu $v0, $v0, $v1 -/* D6F9DC 8024102C 00021080 */ sll $v0, $v0, 2 -/* D6F9E0 80241030 00431023 */ subu $v0, $v0, $v1 -/* D6F9E4 80241034 000218C0 */ sll $v1, $v0, 3 -/* D6F9E8 80241038 00431021 */ addu $v0, $v0, $v1 -/* D6F9EC 8024103C 000210C0 */ sll $v0, $v0, 3 -/* D6F9F0 80241040 46001032 */ c.eq.s $f2, $f0 -/* D6F9F4 80241044 3C01800B */ lui $at, 0x800b -/* D6F9F8 80241048 00220821 */ addu $at, $at, $v0 -/* D6F9FC 8024104C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6FA00 80241050 45000005 */ bc1f .L80241068 -/* D6FA04 80241054 00000000 */ nop -/* D6FA08 80241058 3C0142C8 */ lui $at, 0x42c8 -/* D6FA0C 8024105C 44810000 */ mtc1 $at, $f0 -/* D6FA10 80241060 0809041E */ j .L80241078 -/* D6FA14 80241064 4600B581 */ sub.s $f22, $f22, $f0 -.L80241068: -/* D6FA18 80241068 3C0142C8 */ lui $at, 0x42c8 -/* D6FA1C 8024106C 44810000 */ mtc1 $at, $f0 -/* D6FA20 80241070 00000000 */ nop -/* D6FA24 80241074 4600B580 */ add.s $f22, $f22, $f0 -.L80241078: -/* D6FA28 80241078 0C00A6C9 */ jal clamp_angle -/* D6FA2C 8024107C 4600B306 */ mov.s $f12, $f22 -/* D6FA30 80241080 46000586 */ mov.s $f22, $f0 -/* D6FA34 80241084 3C014170 */ lui $at, 0x4170 -/* D6FA38 80241088 4481A000 */ mtc1 $at, $f20 -/* D6FA3C 8024108C 0C00A8BB */ jal sin_deg -/* D6FA40 80241090 4600B306 */ mov.s $f12, $f22 -/* D6FA44 80241094 46140002 */ mul.s $f0, $f0, $f20 -/* D6FA48 80241098 00000000 */ nop -/* D6FA4C 8024109C 864200B0 */ lh $v0, 0xb0($s2) -/* D6FA50 802410A0 3C013F00 */ lui $at, 0x3f00 -/* D6FA54 802410A4 44812000 */ mtc1 $at, $f4 -/* D6FA58 802410A8 44821000 */ mtc1 $v0, $f2 -/* D6FA5C 802410AC 00000000 */ nop -/* D6FA60 802410B0 468010A0 */ cvt.s.w $f2, $f2 -/* D6FA64 802410B4 46041082 */ mul.s $f2, $f2, $f4 -/* D6FA68 802410B8 00000000 */ nop -/* D6FA6C 802410BC 4600E700 */ add.s $f28, $f28, $f0 -/* D6FA70 802410C0 4602D680 */ add.s $f26, $f26, $f2 -/* D6FA74 802410C4 0C00A8D4 */ jal cos_deg -/* D6FA78 802410C8 4600B306 */ mov.s $f12, $f22 -/* D6FA7C 802410CC 46140002 */ mul.s $f0, $f0, $f20 -/* D6FA80 802410D0 00000000 */ nop -/* D6FA84 802410D4 0220202D */ daddu $a0, $s1, $zero -/* D6FA88 802410D8 0260282D */ daddu $a1, $s3, $zero -/* D6FA8C 802410DC 4600E18D */ trunc.w.s $f6, $f28 -/* D6FA90 802410E0 44063000 */ mfc1 $a2, $f6 -/* D6FA94 802410E4 0C0B2026 */ jal set_variable -/* D6FA98 802410E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D6FA9C 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D6FAA0 802410F0 4600D18D */ trunc.w.s $f6, $f26 -/* D6FAA4 802410F4 44063000 */ mfc1 $a2, $f6 -/* D6FAA8 802410F8 0C0B2026 */ jal set_variable -/* D6FAAC 802410FC 0280282D */ daddu $a1, $s4, $zero -/* D6FAB0 80241100 0220202D */ daddu $a0, $s1, $zero -/* D6FAB4 80241104 4600C18D */ trunc.w.s $f6, $f24 -/* D6FAB8 80241108 44063000 */ mfc1 $a2, $f6 -/* D6FABC 8024110C 0C0B2026 */ jal set_variable -/* D6FAC0 80241110 0200282D */ daddu $a1, $s0, $zero -/* D6FAC4 80241114 8FBF0024 */ lw $ra, 0x24($sp) -/* D6FAC8 80241118 8FB40020 */ lw $s4, 0x20($sp) -/* D6FACC 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* D6FAD0 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* D6FAD4 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* D6FAD8 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* D6FADC 8024112C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D6FAE0 80241130 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D6FAE4 80241134 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D6FAE8 80241138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D6FAEC 8024113C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D6FAF0 80241140 24020002 */ addiu $v0, $zero, 2 -/* D6FAF4 80241144 03E00008 */ jr $ra -/* D6FAF8 80241148 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024007C_D7EDDC.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024007C_D7EDDC.s deleted file mode 100644 index 98283a1fad..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024007C_D7EDDC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024007C_D7EDDC -/* D7EDDC 8024007C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D7EDE0 80240080 AFB10014 */ sw $s1, 0x14($sp) -/* D7EDE4 80240084 0080882D */ daddu $s1, $a0, $zero -/* D7EDE8 80240088 AFBF0024 */ sw $ra, 0x24($sp) -/* D7EDEC 8024008C AFB40020 */ sw $s4, 0x20($sp) -/* D7EDF0 80240090 AFB3001C */ sw $s3, 0x1c($sp) -/* D7EDF4 80240094 AFB20018 */ sw $s2, 0x18($sp) -/* D7EDF8 80240098 AFB00010 */ sw $s0, 0x10($sp) -/* D7EDFC 8024009C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D7EE00 802400A0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D7EE04 802400A4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D7EE08 802400A8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D7EE0C 802400AC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D7EE10 802400B0 8E30000C */ lw $s0, 0xc($s1) -/* D7EE14 802400B4 8E130000 */ lw $s3, ($s0) -/* D7EE18 802400B8 26100004 */ addiu $s0, $s0, 4 -/* D7EE1C 802400BC 0C0B1EAF */ jal get_variable -/* D7EE20 802400C0 0260282D */ daddu $a1, $s3, $zero -/* D7EE24 802400C4 4482E000 */ mtc1 $v0, $f28 -/* D7EE28 802400C8 00000000 */ nop -/* D7EE2C 802400CC 4680E720 */ cvt.s.w $f28, $f28 -/* D7EE30 802400D0 8E140000 */ lw $s4, ($s0) -/* D7EE34 802400D4 26100004 */ addiu $s0, $s0, 4 -/* D7EE38 802400D8 0220202D */ daddu $a0, $s1, $zero -/* D7EE3C 802400DC 0C0B1EAF */ jal get_variable -/* D7EE40 802400E0 0280282D */ daddu $a1, $s4, $zero -/* D7EE44 802400E4 4482D000 */ mtc1 $v0, $f26 -/* D7EE48 802400E8 00000000 */ nop -/* D7EE4C 802400EC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D7EE50 802400F0 8E100000 */ lw $s0, ($s0) -/* D7EE54 802400F4 0220202D */ daddu $a0, $s1, $zero -/* D7EE58 802400F8 0C0B1EAF */ jal get_variable -/* D7EE5C 802400FC 0200282D */ daddu $a1, $s0, $zero -/* D7EE60 80240100 4482C000 */ mtc1 $v0, $f24 -/* D7EE64 80240104 00000000 */ nop -/* D7EE68 80240108 4680C620 */ cvt.s.w $f24, $f24 -/* D7EE6C 8024010C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D7EE70 80240110 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D7EE74 80240114 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D7EE78 80240118 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D7EE7C 8024011C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D7EE80 80240120 44800000 */ mtc1 $zero, $f0 -/* D7EE84 80240124 00031080 */ sll $v0, $v1, 2 -/* D7EE88 80240128 00431021 */ addu $v0, $v0, $v1 -/* D7EE8C 8024012C 00021080 */ sll $v0, $v0, 2 -/* D7EE90 80240130 00431023 */ subu $v0, $v0, $v1 -/* D7EE94 80240134 000218C0 */ sll $v1, $v0, 3 -/* D7EE98 80240138 00431021 */ addu $v0, $v0, $v1 -/* D7EE9C 8024013C 000210C0 */ sll $v0, $v0, 3 -/* D7EEA0 80240140 46001032 */ c.eq.s $f2, $f0 -/* D7EEA4 80240144 3C01800B */ lui $at, 0x800b -/* D7EEA8 80240148 00220821 */ addu $at, $at, $v0 -/* D7EEAC 8024014C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D7EEB0 80240150 45000005 */ bc1f .L80240168 -/* D7EEB4 80240154 00000000 */ nop -/* D7EEB8 80240158 3C0142C8 */ lui $at, 0x42c8 -/* D7EEBC 8024015C 44810000 */ mtc1 $at, $f0 -/* D7EEC0 80240160 0809005E */ j .L80240178 -/* D7EEC4 80240164 4600B581 */ sub.s $f22, $f22, $f0 -.L80240168: -/* D7EEC8 80240168 3C0142C8 */ lui $at, 0x42c8 -/* D7EECC 8024016C 44810000 */ mtc1 $at, $f0 -/* D7EED0 80240170 00000000 */ nop -/* D7EED4 80240174 4600B580 */ add.s $f22, $f22, $f0 -.L80240178: -/* D7EED8 80240178 0C00A6C9 */ jal clamp_angle -/* D7EEDC 8024017C 4600B306 */ mov.s $f12, $f22 -/* D7EEE0 80240180 46000586 */ mov.s $f22, $f0 -/* D7EEE4 80240184 3C014170 */ lui $at, 0x4170 -/* D7EEE8 80240188 4481A000 */ mtc1 $at, $f20 -/* D7EEEC 8024018C 0C00A8BB */ jal sin_deg -/* D7EEF0 80240190 4600B306 */ mov.s $f12, $f22 -/* D7EEF4 80240194 46140002 */ mul.s $f0, $f0, $f20 -/* D7EEF8 80240198 00000000 */ nop -/* D7EEFC 8024019C 864200B0 */ lh $v0, 0xb0($s2) -/* D7EF00 802401A0 3C013F00 */ lui $at, 0x3f00 -/* D7EF04 802401A4 44812000 */ mtc1 $at, $f4 -/* D7EF08 802401A8 44821000 */ mtc1 $v0, $f2 -/* D7EF0C 802401AC 00000000 */ nop -/* D7EF10 802401B0 468010A0 */ cvt.s.w $f2, $f2 -/* D7EF14 802401B4 46041082 */ mul.s $f2, $f2, $f4 -/* D7EF18 802401B8 00000000 */ nop -/* D7EF1C 802401BC 4600E700 */ add.s $f28, $f28, $f0 -/* D7EF20 802401C0 4602D680 */ add.s $f26, $f26, $f2 -/* D7EF24 802401C4 0C00A8D4 */ jal cos_deg -/* D7EF28 802401C8 4600B306 */ mov.s $f12, $f22 -/* D7EF2C 802401CC 46140002 */ mul.s $f0, $f0, $f20 -/* D7EF30 802401D0 00000000 */ nop -/* D7EF34 802401D4 0220202D */ daddu $a0, $s1, $zero -/* D7EF38 802401D8 0260282D */ daddu $a1, $s3, $zero -/* D7EF3C 802401DC 4600E18D */ trunc.w.s $f6, $f28 -/* D7EF40 802401E0 44063000 */ mfc1 $a2, $f6 -/* D7EF44 802401E4 0C0B2026 */ jal set_variable -/* D7EF48 802401E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D7EF4C 802401EC 0220202D */ daddu $a0, $s1, $zero -/* D7EF50 802401F0 4600D18D */ trunc.w.s $f6, $f26 -/* D7EF54 802401F4 44063000 */ mfc1 $a2, $f6 -/* D7EF58 802401F8 0C0B2026 */ jal set_variable -/* D7EF5C 802401FC 0280282D */ daddu $a1, $s4, $zero -/* D7EF60 80240200 0220202D */ daddu $a0, $s1, $zero -/* D7EF64 80240204 4600C18D */ trunc.w.s $f6, $f24 -/* D7EF68 80240208 44063000 */ mfc1 $a2, $f6 -/* D7EF6C 8024020C 0C0B2026 */ jal set_variable -/* D7EF70 80240210 0200282D */ daddu $a1, $s0, $zero -/* D7EF74 80240214 8FBF0024 */ lw $ra, 0x24($sp) -/* D7EF78 80240218 8FB40020 */ lw $s4, 0x20($sp) -/* D7EF7C 8024021C 8FB3001C */ lw $s3, 0x1c($sp) -/* D7EF80 80240220 8FB20018 */ lw $s2, 0x18($sp) -/* D7EF84 80240224 8FB10014 */ lw $s1, 0x14($sp) -/* D7EF88 80240228 8FB00010 */ lw $s0, 0x10($sp) -/* D7EF8C 8024022C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D7EF90 80240230 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D7EF94 80240234 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D7EF98 80240238 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D7EF9C 8024023C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D7EFA0 80240240 24020002 */ addiu $v0, $zero, 2 -/* D7EFA4 80240244 03E00008 */ jr $ra -/* D7EFA8 80240248 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024036C_CF7EDC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024036C_CF7EDC.s deleted file mode 100644 index 3af04e028a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024036C_CF7EDC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_CF7EDC -/* CF7EDC 8024036C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF7EE0 80240370 AFB10014 */ sw $s1, 0x14($sp) -/* CF7EE4 80240374 0080882D */ daddu $s1, $a0, $zero -/* CF7EE8 80240378 AFBF0024 */ sw $ra, 0x24($sp) -/* CF7EEC 8024037C AFB40020 */ sw $s4, 0x20($sp) -/* CF7EF0 80240380 AFB3001C */ sw $s3, 0x1c($sp) -/* CF7EF4 80240384 AFB20018 */ sw $s2, 0x18($sp) -/* CF7EF8 80240388 AFB00010 */ sw $s0, 0x10($sp) -/* CF7EFC 8024038C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CF7F00 80240390 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CF7F04 80240394 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CF7F08 80240398 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CF7F0C 8024039C F7B40028 */ sdc1 $f20, 0x28($sp) -/* CF7F10 802403A0 8E30000C */ lw $s0, 0xc($s1) -/* CF7F14 802403A4 8E130000 */ lw $s3, ($s0) -/* CF7F18 802403A8 26100004 */ addiu $s0, $s0, 4 -/* CF7F1C 802403AC 0C0B1EAF */ jal get_variable -/* CF7F20 802403B0 0260282D */ daddu $a1, $s3, $zero -/* CF7F24 802403B4 4482E000 */ mtc1 $v0, $f28 -/* CF7F28 802403B8 00000000 */ nop -/* CF7F2C 802403BC 4680E720 */ cvt.s.w $f28, $f28 -/* CF7F30 802403C0 8E140000 */ lw $s4, ($s0) -/* CF7F34 802403C4 26100004 */ addiu $s0, $s0, 4 -/* CF7F38 802403C8 0220202D */ daddu $a0, $s1, $zero -/* CF7F3C 802403CC 0C0B1EAF */ jal get_variable -/* CF7F40 802403D0 0280282D */ daddu $a1, $s4, $zero -/* CF7F44 802403D4 4482D000 */ mtc1 $v0, $f26 -/* CF7F48 802403D8 00000000 */ nop -/* CF7F4C 802403DC 4680D6A0 */ cvt.s.w $f26, $f26 -/* CF7F50 802403E0 8E100000 */ lw $s0, ($s0) -/* CF7F54 802403E4 0220202D */ daddu $a0, $s1, $zero -/* CF7F58 802403E8 0C0B1EAF */ jal get_variable -/* CF7F5C 802403EC 0200282D */ daddu $a1, $s0, $zero -/* CF7F60 802403F0 4482C000 */ mtc1 $v0, $f24 -/* CF7F64 802403F4 00000000 */ nop -/* CF7F68 802403F8 4680C620 */ cvt.s.w $f24, $f24 -/* CF7F6C 802403FC 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CF7F70 80240400 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CF7F74 80240404 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CF7F78 80240408 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CF7F7C 8024040C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CF7F80 80240410 44800000 */ mtc1 $zero, $f0 -/* CF7F84 80240414 00031080 */ sll $v0, $v1, 2 -/* CF7F88 80240418 00431021 */ addu $v0, $v0, $v1 -/* CF7F8C 8024041C 00021080 */ sll $v0, $v0, 2 -/* CF7F90 80240420 00431023 */ subu $v0, $v0, $v1 -/* CF7F94 80240424 000218C0 */ sll $v1, $v0, 3 -/* CF7F98 80240428 00431021 */ addu $v0, $v0, $v1 -/* CF7F9C 8024042C 000210C0 */ sll $v0, $v0, 3 -/* CF7FA0 80240430 46001032 */ c.eq.s $f2, $f0 -/* CF7FA4 80240434 3C01800B */ lui $at, 0x800b -/* CF7FA8 80240438 00220821 */ addu $at, $at, $v0 -/* CF7FAC 8024043C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CF7FB0 80240440 45000005 */ bc1f .L80240458 -/* CF7FB4 80240444 00000000 */ nop -/* CF7FB8 80240448 3C0142C8 */ lui $at, 0x42c8 -/* CF7FBC 8024044C 44810000 */ mtc1 $at, $f0 -/* CF7FC0 80240450 0809011A */ j .L80240468 -/* CF7FC4 80240454 4600B581 */ sub.s $f22, $f22, $f0 -.L80240458: -/* CF7FC8 80240458 3C0142C8 */ lui $at, 0x42c8 -/* CF7FCC 8024045C 44810000 */ mtc1 $at, $f0 -/* CF7FD0 80240460 00000000 */ nop -/* CF7FD4 80240464 4600B580 */ add.s $f22, $f22, $f0 -.L80240468: -/* CF7FD8 80240468 0C00A6C9 */ jal clamp_angle -/* CF7FDC 8024046C 4600B306 */ mov.s $f12, $f22 -/* CF7FE0 80240470 46000586 */ mov.s $f22, $f0 -/* CF7FE4 80240474 3C014170 */ lui $at, 0x4170 -/* CF7FE8 80240478 4481A000 */ mtc1 $at, $f20 -/* CF7FEC 8024047C 0C00A8BB */ jal sin_deg -/* CF7FF0 80240480 4600B306 */ mov.s $f12, $f22 -/* CF7FF4 80240484 46140002 */ mul.s $f0, $f0, $f20 -/* CF7FF8 80240488 00000000 */ nop -/* CF7FFC 8024048C 864200B0 */ lh $v0, 0xb0($s2) -/* CF8000 80240490 3C013F00 */ lui $at, 0x3f00 -/* CF8004 80240494 44812000 */ mtc1 $at, $f4 -/* CF8008 80240498 44821000 */ mtc1 $v0, $f2 -/* CF800C 8024049C 00000000 */ nop -/* CF8010 802404A0 468010A0 */ cvt.s.w $f2, $f2 -/* CF8014 802404A4 46041082 */ mul.s $f2, $f2, $f4 -/* CF8018 802404A8 00000000 */ nop -/* CF801C 802404AC 4600E700 */ add.s $f28, $f28, $f0 -/* CF8020 802404B0 4602D680 */ add.s $f26, $f26, $f2 -/* CF8024 802404B4 0C00A8D4 */ jal cos_deg -/* CF8028 802404B8 4600B306 */ mov.s $f12, $f22 -/* CF802C 802404BC 46140002 */ mul.s $f0, $f0, $f20 -/* CF8030 802404C0 00000000 */ nop -/* CF8034 802404C4 0220202D */ daddu $a0, $s1, $zero -/* CF8038 802404C8 0260282D */ daddu $a1, $s3, $zero -/* CF803C 802404CC 4600E18D */ trunc.w.s $f6, $f28 -/* CF8040 802404D0 44063000 */ mfc1 $a2, $f6 -/* CF8044 802404D4 0C0B2026 */ jal set_variable -/* CF8048 802404D8 4600C601 */ sub.s $f24, $f24, $f0 -/* CF804C 802404DC 0220202D */ daddu $a0, $s1, $zero -/* CF8050 802404E0 4600D18D */ trunc.w.s $f6, $f26 -/* CF8054 802404E4 44063000 */ mfc1 $a2, $f6 -/* CF8058 802404E8 0C0B2026 */ jal set_variable -/* CF805C 802404EC 0280282D */ daddu $a1, $s4, $zero -/* CF8060 802404F0 0220202D */ daddu $a0, $s1, $zero -/* CF8064 802404F4 4600C18D */ trunc.w.s $f6, $f24 -/* CF8068 802404F8 44063000 */ mfc1 $a2, $f6 -/* CF806C 802404FC 0C0B2026 */ jal set_variable -/* CF8070 80240500 0200282D */ daddu $a1, $s0, $zero -/* CF8074 80240504 8FBF0024 */ lw $ra, 0x24($sp) -/* CF8078 80240508 8FB40020 */ lw $s4, 0x20($sp) -/* CF807C 8024050C 8FB3001C */ lw $s3, 0x1c($sp) -/* CF8080 80240510 8FB20018 */ lw $s2, 0x18($sp) -/* CF8084 80240514 8FB10014 */ lw $s1, 0x14($sp) -/* CF8088 80240518 8FB00010 */ lw $s0, 0x10($sp) -/* CF808C 8024051C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CF8090 80240520 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CF8094 80240524 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CF8098 80240528 D7B60030 */ ldc1 $f22, 0x30($sp) -/* CF809C 8024052C D7B40028 */ ldc1 $f20, 0x28($sp) -/* CF80A0 80240530 24020002 */ addiu $v0, $zero, 2 -/* CF80A4 80240534 03E00008 */ jr $ra -/* CF80A8 80240538 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024036C_D1393C.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024036C_D1393C.s deleted file mode 100644 index d053f418c0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024036C_D1393C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_D1393C -/* D1393C 8024036C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D13940 80240370 AFB10014 */ sw $s1, 0x14($sp) -/* D13944 80240374 0080882D */ daddu $s1, $a0, $zero -/* D13948 80240378 AFBF0024 */ sw $ra, 0x24($sp) -/* D1394C 8024037C AFB40020 */ sw $s4, 0x20($sp) -/* D13950 80240380 AFB3001C */ sw $s3, 0x1c($sp) -/* D13954 80240384 AFB20018 */ sw $s2, 0x18($sp) -/* D13958 80240388 AFB00010 */ sw $s0, 0x10($sp) -/* D1395C 8024038C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D13960 80240390 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D13964 80240394 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D13968 80240398 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D1396C 8024039C F7B40028 */ sdc1 $f20, 0x28($sp) -/* D13970 802403A0 8E30000C */ lw $s0, 0xc($s1) -/* D13974 802403A4 8E130000 */ lw $s3, ($s0) -/* D13978 802403A8 26100004 */ addiu $s0, $s0, 4 -/* D1397C 802403AC 0C0B1EAF */ jal get_variable -/* D13980 802403B0 0260282D */ daddu $a1, $s3, $zero -/* D13984 802403B4 4482E000 */ mtc1 $v0, $f28 -/* D13988 802403B8 00000000 */ nop -/* D1398C 802403BC 4680E720 */ cvt.s.w $f28, $f28 -/* D13990 802403C0 8E140000 */ lw $s4, ($s0) -/* D13994 802403C4 26100004 */ addiu $s0, $s0, 4 -/* D13998 802403C8 0220202D */ daddu $a0, $s1, $zero -/* D1399C 802403CC 0C0B1EAF */ jal get_variable -/* D139A0 802403D0 0280282D */ daddu $a1, $s4, $zero -/* D139A4 802403D4 4482D000 */ mtc1 $v0, $f26 -/* D139A8 802403D8 00000000 */ nop -/* D139AC 802403DC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D139B0 802403E0 8E100000 */ lw $s0, ($s0) -/* D139B4 802403E4 0220202D */ daddu $a0, $s1, $zero -/* D139B8 802403E8 0C0B1EAF */ jal get_variable -/* D139BC 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D139C0 802403F0 4482C000 */ mtc1 $v0, $f24 -/* D139C4 802403F4 00000000 */ nop -/* D139C8 802403F8 4680C620 */ cvt.s.w $f24, $f24 -/* D139CC 802403FC 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D139D0 80240400 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D139D4 80240404 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D139D8 80240408 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D139DC 8024040C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D139E0 80240410 44800000 */ mtc1 $zero, $f0 -/* D139E4 80240414 00031080 */ sll $v0, $v1, 2 -/* D139E8 80240418 00431021 */ addu $v0, $v0, $v1 -/* D139EC 8024041C 00021080 */ sll $v0, $v0, 2 -/* D139F0 80240420 00431023 */ subu $v0, $v0, $v1 -/* D139F4 80240424 000218C0 */ sll $v1, $v0, 3 -/* D139F8 80240428 00431021 */ addu $v0, $v0, $v1 -/* D139FC 8024042C 000210C0 */ sll $v0, $v0, 3 -/* D13A00 80240430 46001032 */ c.eq.s $f2, $f0 -/* D13A04 80240434 3C01800B */ lui $at, 0x800b -/* D13A08 80240438 00220821 */ addu $at, $at, $v0 -/* D13A0C 8024043C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D13A10 80240440 45000005 */ bc1f .L80240458 -/* D13A14 80240444 00000000 */ nop -/* D13A18 80240448 3C0142C8 */ lui $at, 0x42c8 -/* D13A1C 8024044C 44810000 */ mtc1 $at, $f0 -/* D13A20 80240450 0809011A */ j .L80240468 -/* D13A24 80240454 4600B581 */ sub.s $f22, $f22, $f0 -.L80240458: -/* D13A28 80240458 3C0142C8 */ lui $at, 0x42c8 -/* D13A2C 8024045C 44810000 */ mtc1 $at, $f0 -/* D13A30 80240460 00000000 */ nop -/* D13A34 80240464 4600B580 */ add.s $f22, $f22, $f0 -.L80240468: -/* D13A38 80240468 0C00A6C9 */ jal clamp_angle -/* D13A3C 8024046C 4600B306 */ mov.s $f12, $f22 -/* D13A40 80240470 46000586 */ mov.s $f22, $f0 -/* D13A44 80240474 3C014170 */ lui $at, 0x4170 -/* D13A48 80240478 4481A000 */ mtc1 $at, $f20 -/* D13A4C 8024047C 0C00A8BB */ jal sin_deg -/* D13A50 80240480 4600B306 */ mov.s $f12, $f22 -/* D13A54 80240484 46140002 */ mul.s $f0, $f0, $f20 -/* D13A58 80240488 00000000 */ nop -/* D13A5C 8024048C 864200B0 */ lh $v0, 0xb0($s2) -/* D13A60 80240490 3C013F00 */ lui $at, 0x3f00 -/* D13A64 80240494 44812000 */ mtc1 $at, $f4 -/* D13A68 80240498 44821000 */ mtc1 $v0, $f2 -/* D13A6C 8024049C 00000000 */ nop -/* D13A70 802404A0 468010A0 */ cvt.s.w $f2, $f2 -/* D13A74 802404A4 46041082 */ mul.s $f2, $f2, $f4 -/* D13A78 802404A8 00000000 */ nop -/* D13A7C 802404AC 4600E700 */ add.s $f28, $f28, $f0 -/* D13A80 802404B0 4602D680 */ add.s $f26, $f26, $f2 -/* D13A84 802404B4 0C00A8D4 */ jal cos_deg -/* D13A88 802404B8 4600B306 */ mov.s $f12, $f22 -/* D13A8C 802404BC 46140002 */ mul.s $f0, $f0, $f20 -/* D13A90 802404C0 00000000 */ nop -/* D13A94 802404C4 0220202D */ daddu $a0, $s1, $zero -/* D13A98 802404C8 0260282D */ daddu $a1, $s3, $zero -/* D13A9C 802404CC 4600E18D */ trunc.w.s $f6, $f28 -/* D13AA0 802404D0 44063000 */ mfc1 $a2, $f6 -/* D13AA4 802404D4 0C0B2026 */ jal set_variable -/* D13AA8 802404D8 4600C601 */ sub.s $f24, $f24, $f0 -/* D13AAC 802404DC 0220202D */ daddu $a0, $s1, $zero -/* D13AB0 802404E0 4600D18D */ trunc.w.s $f6, $f26 -/* D13AB4 802404E4 44063000 */ mfc1 $a2, $f6 -/* D13AB8 802404E8 0C0B2026 */ jal set_variable -/* D13ABC 802404EC 0280282D */ daddu $a1, $s4, $zero -/* D13AC0 802404F0 0220202D */ daddu $a0, $s1, $zero -/* D13AC4 802404F4 4600C18D */ trunc.w.s $f6, $f24 -/* D13AC8 802404F8 44063000 */ mfc1 $a2, $f6 -/* D13ACC 802404FC 0C0B2026 */ jal set_variable -/* D13AD0 80240500 0200282D */ daddu $a1, $s0, $zero -/* D13AD4 80240504 8FBF0024 */ lw $ra, 0x24($sp) -/* D13AD8 80240508 8FB40020 */ lw $s4, 0x20($sp) -/* D13ADC 8024050C 8FB3001C */ lw $s3, 0x1c($sp) -/* D13AE0 80240510 8FB20018 */ lw $s2, 0x18($sp) -/* D13AE4 80240514 8FB10014 */ lw $s1, 0x14($sp) -/* D13AE8 80240518 8FB00010 */ lw $s0, 0x10($sp) -/* D13AEC 8024051C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D13AF0 80240520 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D13AF4 80240524 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D13AF8 80240528 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D13AFC 8024052C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D13B00 80240530 24020002 */ addiu $v0, $zero, 2 -/* D13B04 80240534 03E00008 */ jr $ra -/* D13B08 80240538 27BD0050 */ addiu $sp, $sp, 0x50 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 40d8450830..8b97f0e8bd 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 @@ -165,7 +165,7 @@ glabel func_8024061C_D18DFC /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 /* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* D1906C 8024088C 00000000 */ nop -/* D19070 80240890 0C09006D */ jal func_802401B4 +/* D19070 80240890 0C09006D */ jal func_802401B4_D18994 /* D19074 80240894 0240202D */ daddu $a0, $s2, $zero /* D19078 80240898 0809022A */ j .L802408A8 /* D1907C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241BBC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241BBC.s deleted file mode 100644 index 11fe61876d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241BBC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BBC -/* D21A4C 80241BBC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D21A50 80241BC0 AFB10014 */ sw $s1, 0x14($sp) -/* D21A54 80241BC4 0080882D */ daddu $s1, $a0, $zero -/* D21A58 80241BC8 AFBF0024 */ sw $ra, 0x24($sp) -/* D21A5C 80241BCC AFB40020 */ sw $s4, 0x20($sp) -/* D21A60 80241BD0 AFB3001C */ sw $s3, 0x1c($sp) -/* D21A64 80241BD4 AFB20018 */ sw $s2, 0x18($sp) -/* D21A68 80241BD8 AFB00010 */ sw $s0, 0x10($sp) -/* D21A6C 80241BDC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D21A70 80241BE0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D21A74 80241BE4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D21A78 80241BE8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D21A7C 80241BEC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D21A80 80241BF0 8E30000C */ lw $s0, 0xc($s1) -/* D21A84 80241BF4 8E130000 */ lw $s3, ($s0) -/* D21A88 80241BF8 26100004 */ addiu $s0, $s0, 4 -/* D21A8C 80241BFC 0C0B1EAF */ jal get_variable -/* D21A90 80241C00 0260282D */ daddu $a1, $s3, $zero -/* D21A94 80241C04 4482E000 */ mtc1 $v0, $f28 -/* D21A98 80241C08 00000000 */ nop -/* D21A9C 80241C0C 4680E720 */ cvt.s.w $f28, $f28 -/* D21AA0 80241C10 8E140000 */ lw $s4, ($s0) -/* D21AA4 80241C14 26100004 */ addiu $s0, $s0, 4 -/* D21AA8 80241C18 0220202D */ daddu $a0, $s1, $zero -/* D21AAC 80241C1C 0C0B1EAF */ jal get_variable -/* D21AB0 80241C20 0280282D */ daddu $a1, $s4, $zero -/* D21AB4 80241C24 4482D000 */ mtc1 $v0, $f26 -/* D21AB8 80241C28 00000000 */ nop -/* D21ABC 80241C2C 4680D6A0 */ cvt.s.w $f26, $f26 -/* D21AC0 80241C30 8E100000 */ lw $s0, ($s0) -/* D21AC4 80241C34 0220202D */ daddu $a0, $s1, $zero -/* D21AC8 80241C38 0C0B1EAF */ jal get_variable -/* D21ACC 80241C3C 0200282D */ daddu $a1, $s0, $zero -/* D21AD0 80241C40 4482C000 */ mtc1 $v0, $f24 -/* D21AD4 80241C44 00000000 */ nop -/* D21AD8 80241C48 4680C620 */ cvt.s.w $f24, $f24 -/* D21ADC 80241C4C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D21AE0 80241C50 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D21AE4 80241C54 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D21AE8 80241C58 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D21AEC 80241C5C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D21AF0 80241C60 44800000 */ mtc1 $zero, $f0 -/* D21AF4 80241C64 00031080 */ sll $v0, $v1, 2 -/* D21AF8 80241C68 00431021 */ addu $v0, $v0, $v1 -/* D21AFC 80241C6C 00021080 */ sll $v0, $v0, 2 -/* D21B00 80241C70 00431023 */ subu $v0, $v0, $v1 -/* D21B04 80241C74 000218C0 */ sll $v1, $v0, 3 -/* D21B08 80241C78 00431021 */ addu $v0, $v0, $v1 -/* D21B0C 80241C7C 000210C0 */ sll $v0, $v0, 3 -/* D21B10 80241C80 46001032 */ c.eq.s $f2, $f0 -/* D21B14 80241C84 3C01800B */ lui $at, 0x800b -/* D21B18 80241C88 00220821 */ addu $at, $at, $v0 -/* D21B1C 80241C8C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D21B20 80241C90 45000005 */ bc1f .L80241CA8 -/* D21B24 80241C94 00000000 */ nop -/* D21B28 80241C98 3C0142C8 */ lui $at, 0x42c8 -/* D21B2C 80241C9C 44810000 */ mtc1 $at, $f0 -/* D21B30 80241CA0 0809072E */ j .L80241CB8 -/* D21B34 80241CA4 4600B581 */ sub.s $f22, $f22, $f0 -.L80241CA8: -/* D21B38 80241CA8 3C0142C8 */ lui $at, 0x42c8 -/* D21B3C 80241CAC 44810000 */ mtc1 $at, $f0 -/* D21B40 80241CB0 00000000 */ nop -/* D21B44 80241CB4 4600B580 */ add.s $f22, $f22, $f0 -.L80241CB8: -/* D21B48 80241CB8 0C00A6C9 */ jal clamp_angle -/* D21B4C 80241CBC 4600B306 */ mov.s $f12, $f22 -/* D21B50 80241CC0 46000586 */ mov.s $f22, $f0 -/* D21B54 80241CC4 3C014170 */ lui $at, 0x4170 -/* D21B58 80241CC8 4481A000 */ mtc1 $at, $f20 -/* D21B5C 80241CCC 0C00A8BB */ jal sin_deg -/* D21B60 80241CD0 4600B306 */ mov.s $f12, $f22 -/* D21B64 80241CD4 46140002 */ mul.s $f0, $f0, $f20 -/* D21B68 80241CD8 00000000 */ nop -/* D21B6C 80241CDC 864200B0 */ lh $v0, 0xb0($s2) -/* D21B70 80241CE0 3C013F00 */ lui $at, 0x3f00 -/* D21B74 80241CE4 44812000 */ mtc1 $at, $f4 -/* D21B78 80241CE8 44821000 */ mtc1 $v0, $f2 -/* D21B7C 80241CEC 00000000 */ nop -/* D21B80 80241CF0 468010A0 */ cvt.s.w $f2, $f2 -/* D21B84 80241CF4 46041082 */ mul.s $f2, $f2, $f4 -/* D21B88 80241CF8 00000000 */ nop -/* D21B8C 80241CFC 4600E700 */ add.s $f28, $f28, $f0 -/* D21B90 80241D00 4602D680 */ add.s $f26, $f26, $f2 -/* D21B94 80241D04 0C00A8D4 */ jal cos_deg -/* D21B98 80241D08 4600B306 */ mov.s $f12, $f22 -/* D21B9C 80241D0C 46140002 */ mul.s $f0, $f0, $f20 -/* D21BA0 80241D10 00000000 */ nop -/* D21BA4 80241D14 0220202D */ daddu $a0, $s1, $zero -/* D21BA8 80241D18 0260282D */ daddu $a1, $s3, $zero -/* D21BAC 80241D1C 4600E18D */ trunc.w.s $f6, $f28 -/* D21BB0 80241D20 44063000 */ mfc1 $a2, $f6 -/* D21BB4 80241D24 0C0B2026 */ jal set_variable -/* D21BB8 80241D28 4600C601 */ sub.s $f24, $f24, $f0 -/* D21BBC 80241D2C 0220202D */ daddu $a0, $s1, $zero -/* D21BC0 80241D30 4600D18D */ trunc.w.s $f6, $f26 -/* D21BC4 80241D34 44063000 */ mfc1 $a2, $f6 -/* D21BC8 80241D38 0C0B2026 */ jal set_variable -/* D21BCC 80241D3C 0280282D */ daddu $a1, $s4, $zero -/* D21BD0 80241D40 0220202D */ daddu $a0, $s1, $zero -/* D21BD4 80241D44 4600C18D */ trunc.w.s $f6, $f24 -/* D21BD8 80241D48 44063000 */ mfc1 $a2, $f6 -/* D21BDC 80241D4C 0C0B2026 */ jal set_variable -/* D21BE0 80241D50 0200282D */ daddu $a1, $s0, $zero -/* D21BE4 80241D54 8FBF0024 */ lw $ra, 0x24($sp) -/* D21BE8 80241D58 8FB40020 */ lw $s4, 0x20($sp) -/* D21BEC 80241D5C 8FB3001C */ lw $s3, 0x1c($sp) -/* D21BF0 80241D60 8FB20018 */ lw $s2, 0x18($sp) -/* D21BF4 80241D64 8FB10014 */ lw $s1, 0x14($sp) -/* D21BF8 80241D68 8FB00010 */ lw $s0, 0x10($sp) -/* D21BFC 80241D6C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D21C00 80241D70 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D21C04 80241D74 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D21C08 80241D78 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D21C0C 80241D7C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D21C10 80241D80 24020002 */ addiu $v0, $zero, 2 -/* D21C14 80241D84 03E00008 */ jr $ra -/* D21C18 80241D88 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s index de38879092..d31f578235 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s @@ -153,7 +153,7 @@ glabel func_8024135C /* D31214 80241594 00000000 */ nop /* D31218 80241598 0C090350 */ jal func_80240D40 /* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero -/* D31220 802415A0 0C09036B */ jal func_80240DAC +/* D31220 802415A0 0C09036B */ jal func_80240DAC_D30A2C /* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero /* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024074C_92A9FC.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024074C_92A9FC.s deleted file mode 100644 index eed61a470f..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024074C_92A9FC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024074C_92A9FC -/* 92A9FC 8024074C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 92AA00 80240750 AFB10014 */ sw $s1, 0x14($sp) -/* 92AA04 80240754 0080882D */ daddu $s1, $a0, $zero -/* 92AA08 80240758 AFBF0024 */ sw $ra, 0x24($sp) -/* 92AA0C 8024075C AFB40020 */ sw $s4, 0x20($sp) -/* 92AA10 80240760 AFB3001C */ sw $s3, 0x1c($sp) -/* 92AA14 80240764 AFB20018 */ sw $s2, 0x18($sp) -/* 92AA18 80240768 AFB00010 */ sw $s0, 0x10($sp) -/* 92AA1C 8024076C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 92AA20 80240770 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 92AA24 80240774 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 92AA28 80240778 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 92AA2C 8024077C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 92AA30 80240780 8E30000C */ lw $s0, 0xc($s1) -/* 92AA34 80240784 8E130000 */ lw $s3, ($s0) -/* 92AA38 80240788 26100004 */ addiu $s0, $s0, 4 -/* 92AA3C 8024078C 0C0B1EAF */ jal get_variable -/* 92AA40 80240790 0260282D */ daddu $a1, $s3, $zero -/* 92AA44 80240794 4482E000 */ mtc1 $v0, $f28 -/* 92AA48 80240798 00000000 */ nop -/* 92AA4C 8024079C 4680E720 */ cvt.s.w $f28, $f28 -/* 92AA50 802407A0 8E140000 */ lw $s4, ($s0) -/* 92AA54 802407A4 26100004 */ addiu $s0, $s0, 4 -/* 92AA58 802407A8 0220202D */ daddu $a0, $s1, $zero -/* 92AA5C 802407AC 0C0B1EAF */ jal get_variable -/* 92AA60 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 92AA64 802407B4 4482D000 */ mtc1 $v0, $f26 -/* 92AA68 802407B8 00000000 */ nop -/* 92AA6C 802407BC 4680D6A0 */ cvt.s.w $f26, $f26 -/* 92AA70 802407C0 8E100000 */ lw $s0, ($s0) -/* 92AA74 802407C4 0220202D */ daddu $a0, $s1, $zero -/* 92AA78 802407C8 0C0B1EAF */ jal get_variable -/* 92AA7C 802407CC 0200282D */ daddu $a1, $s0, $zero -/* 92AA80 802407D0 4482C000 */ mtc1 $v0, $f24 -/* 92AA84 802407D4 00000000 */ nop -/* 92AA88 802407D8 4680C620 */ cvt.s.w $f24, $f24 -/* 92AA8C 802407DC 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 92AA90 802407E0 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 92AA94 802407E4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 92AA98 802407E8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 92AA9C 802407EC C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 92AAA0 802407F0 44800000 */ mtc1 $zero, $f0 -/* 92AAA4 802407F4 00031080 */ sll $v0, $v1, 2 -/* 92AAA8 802407F8 00431021 */ addu $v0, $v0, $v1 -/* 92AAAC 802407FC 00021080 */ sll $v0, $v0, 2 -/* 92AAB0 80240800 00431023 */ subu $v0, $v0, $v1 -/* 92AAB4 80240804 000218C0 */ sll $v1, $v0, 3 -/* 92AAB8 80240808 00431021 */ addu $v0, $v0, $v1 -/* 92AABC 8024080C 000210C0 */ sll $v0, $v0, 3 -/* 92AAC0 80240810 46001032 */ c.eq.s $f2, $f0 -/* 92AAC4 80240814 3C01800B */ lui $at, 0x800b -/* 92AAC8 80240818 00220821 */ addu $at, $at, $v0 -/* 92AACC 8024081C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 92AAD0 80240820 45000005 */ bc1f .L80240838 -/* 92AAD4 80240824 00000000 */ nop -/* 92AAD8 80240828 3C0142C8 */ lui $at, 0x42c8 -/* 92AADC 8024082C 44810000 */ mtc1 $at, $f0 -/* 92AAE0 80240830 08090212 */ j .L80240848 -/* 92AAE4 80240834 4600B581 */ sub.s $f22, $f22, $f0 -.L80240838: -/* 92AAE8 80240838 3C0142C8 */ lui $at, 0x42c8 -/* 92AAEC 8024083C 44810000 */ mtc1 $at, $f0 -/* 92AAF0 80240840 00000000 */ nop -/* 92AAF4 80240844 4600B580 */ add.s $f22, $f22, $f0 -.L80240848: -/* 92AAF8 80240848 0C00A6C9 */ jal clamp_angle -/* 92AAFC 8024084C 4600B306 */ mov.s $f12, $f22 -/* 92AB00 80240850 46000586 */ mov.s $f22, $f0 -/* 92AB04 80240854 3C014170 */ lui $at, 0x4170 -/* 92AB08 80240858 4481A000 */ mtc1 $at, $f20 -/* 92AB0C 8024085C 0C00A8BB */ jal sin_deg -/* 92AB10 80240860 4600B306 */ mov.s $f12, $f22 -/* 92AB14 80240864 46140002 */ mul.s $f0, $f0, $f20 -/* 92AB18 80240868 00000000 */ nop -/* 92AB1C 8024086C 864200B0 */ lh $v0, 0xb0($s2) -/* 92AB20 80240870 3C013F00 */ lui $at, 0x3f00 -/* 92AB24 80240874 44812000 */ mtc1 $at, $f4 -/* 92AB28 80240878 44821000 */ mtc1 $v0, $f2 -/* 92AB2C 8024087C 00000000 */ nop -/* 92AB30 80240880 468010A0 */ cvt.s.w $f2, $f2 -/* 92AB34 80240884 46041082 */ mul.s $f2, $f2, $f4 -/* 92AB38 80240888 00000000 */ nop -/* 92AB3C 8024088C 4600E700 */ add.s $f28, $f28, $f0 -/* 92AB40 80240890 4602D680 */ add.s $f26, $f26, $f2 -/* 92AB44 80240894 0C00A8D4 */ jal cos_deg -/* 92AB48 80240898 4600B306 */ mov.s $f12, $f22 -/* 92AB4C 8024089C 46140002 */ mul.s $f0, $f0, $f20 -/* 92AB50 802408A0 00000000 */ nop -/* 92AB54 802408A4 0220202D */ daddu $a0, $s1, $zero -/* 92AB58 802408A8 0260282D */ daddu $a1, $s3, $zero -/* 92AB5C 802408AC 4600E18D */ trunc.w.s $f6, $f28 -/* 92AB60 802408B0 44063000 */ mfc1 $a2, $f6 -/* 92AB64 802408B4 0C0B2026 */ jal set_variable -/* 92AB68 802408B8 4600C601 */ sub.s $f24, $f24, $f0 -/* 92AB6C 802408BC 0220202D */ daddu $a0, $s1, $zero -/* 92AB70 802408C0 4600D18D */ trunc.w.s $f6, $f26 -/* 92AB74 802408C4 44063000 */ mfc1 $a2, $f6 -/* 92AB78 802408C8 0C0B2026 */ jal set_variable -/* 92AB7C 802408CC 0280282D */ daddu $a1, $s4, $zero -/* 92AB80 802408D0 0220202D */ daddu $a0, $s1, $zero -/* 92AB84 802408D4 4600C18D */ trunc.w.s $f6, $f24 -/* 92AB88 802408D8 44063000 */ mfc1 $a2, $f6 -/* 92AB8C 802408DC 0C0B2026 */ jal set_variable -/* 92AB90 802408E0 0200282D */ daddu $a1, $s0, $zero -/* 92AB94 802408E4 8FBF0024 */ lw $ra, 0x24($sp) -/* 92AB98 802408E8 8FB40020 */ lw $s4, 0x20($sp) -/* 92AB9C 802408EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 92ABA0 802408F0 8FB20018 */ lw $s2, 0x18($sp) -/* 92ABA4 802408F4 8FB10014 */ lw $s1, 0x14($sp) -/* 92ABA8 802408F8 8FB00010 */ lw $s0, 0x10($sp) -/* 92ABAC 802408FC D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 92ABB0 80240900 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 92ABB4 80240904 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 92ABB8 80240908 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 92ABBC 8024090C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 92ABC0 80240910 24020002 */ addiu $v0, $zero, 2 -/* 92ABC4 80240914 03E00008 */ jr $ra -/* 92ABC8 80240918 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240F50_940500.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240F50_940500.s deleted file mode 100644 index fcbc7ada43..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240F50_940500.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_940500 -/* 940500 80240F50 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 940504 80240F54 AFB10014 */ sw $s1, 0x14($sp) -/* 940508 80240F58 0080882D */ daddu $s1, $a0, $zero -/* 94050C 80240F5C AFBF0024 */ sw $ra, 0x24($sp) -/* 940510 80240F60 AFB40020 */ sw $s4, 0x20($sp) -/* 940514 80240F64 AFB3001C */ sw $s3, 0x1c($sp) -/* 940518 80240F68 AFB20018 */ sw $s2, 0x18($sp) -/* 94051C 80240F6C AFB00010 */ sw $s0, 0x10($sp) -/* 940520 80240F70 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 940524 80240F74 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 940528 80240F78 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 94052C 80240F7C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 940530 80240F80 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 940534 80240F84 8E30000C */ lw $s0, 0xc($s1) -/* 940538 80240F88 8E130000 */ lw $s3, ($s0) -/* 94053C 80240F8C 26100004 */ addiu $s0, $s0, 4 -/* 940540 80240F90 0C0B1EAF */ jal get_variable -/* 940544 80240F94 0260282D */ daddu $a1, $s3, $zero -/* 940548 80240F98 4482E000 */ mtc1 $v0, $f28 -/* 94054C 80240F9C 00000000 */ nop -/* 940550 80240FA0 4680E720 */ cvt.s.w $f28, $f28 -/* 940554 80240FA4 8E140000 */ lw $s4, ($s0) -/* 940558 80240FA8 26100004 */ addiu $s0, $s0, 4 -/* 94055C 80240FAC 0220202D */ daddu $a0, $s1, $zero -/* 940560 80240FB0 0C0B1EAF */ jal get_variable -/* 940564 80240FB4 0280282D */ daddu $a1, $s4, $zero -/* 940568 80240FB8 4482D000 */ mtc1 $v0, $f26 -/* 94056C 80240FBC 00000000 */ nop -/* 940570 80240FC0 4680D6A0 */ cvt.s.w $f26, $f26 -/* 940574 80240FC4 8E100000 */ lw $s0, ($s0) -/* 940578 80240FC8 0220202D */ daddu $a0, $s1, $zero -/* 94057C 80240FCC 0C0B1EAF */ jal get_variable -/* 940580 80240FD0 0200282D */ daddu $a1, $s0, $zero -/* 940584 80240FD4 4482C000 */ mtc1 $v0, $f24 -/* 940588 80240FD8 00000000 */ nop -/* 94058C 80240FDC 4680C620 */ cvt.s.w $f24, $f24 -/* 940590 80240FE0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 940594 80240FE4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 940598 80240FE8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 94059C 80240FEC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9405A0 80240FF0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 9405A4 80240FF4 44800000 */ mtc1 $zero, $f0 -/* 9405A8 80240FF8 00031080 */ sll $v0, $v1, 2 -/* 9405AC 80240FFC 00431021 */ addu $v0, $v0, $v1 -/* 9405B0 80241000 00021080 */ sll $v0, $v0, 2 -/* 9405B4 80241004 00431023 */ subu $v0, $v0, $v1 -/* 9405B8 80241008 000218C0 */ sll $v1, $v0, 3 -/* 9405BC 8024100C 00431021 */ addu $v0, $v0, $v1 -/* 9405C0 80241010 000210C0 */ sll $v0, $v0, 3 -/* 9405C4 80241014 46001032 */ c.eq.s $f2, $f0 -/* 9405C8 80241018 3C01800B */ lui $at, 0x800b -/* 9405CC 8024101C 00220821 */ addu $at, $at, $v0 -/* 9405D0 80241020 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 9405D4 80241024 45000005 */ bc1f .L8024103C -/* 9405D8 80241028 00000000 */ nop -/* 9405DC 8024102C 3C0142C8 */ lui $at, 0x42c8 -/* 9405E0 80241030 44810000 */ mtc1 $at, $f0 -/* 9405E4 80241034 08090413 */ j .L8024104C -/* 9405E8 80241038 4600B581 */ sub.s $f22, $f22, $f0 -.L8024103C: -/* 9405EC 8024103C 3C0142C8 */ lui $at, 0x42c8 -/* 9405F0 80241040 44810000 */ mtc1 $at, $f0 -/* 9405F4 80241044 00000000 */ nop -/* 9405F8 80241048 4600B580 */ add.s $f22, $f22, $f0 -.L8024104C: -/* 9405FC 8024104C 0C00A6C9 */ jal clamp_angle -/* 940600 80241050 4600B306 */ mov.s $f12, $f22 -/* 940604 80241054 46000586 */ mov.s $f22, $f0 -/* 940608 80241058 3C014170 */ lui $at, 0x4170 -/* 94060C 8024105C 4481A000 */ mtc1 $at, $f20 -/* 940610 80241060 0C00A8BB */ jal sin_deg -/* 940614 80241064 4600B306 */ mov.s $f12, $f22 -/* 940618 80241068 46140002 */ mul.s $f0, $f0, $f20 -/* 94061C 8024106C 00000000 */ nop -/* 940620 80241070 864200B0 */ lh $v0, 0xb0($s2) -/* 940624 80241074 3C013F00 */ lui $at, 0x3f00 -/* 940628 80241078 44812000 */ mtc1 $at, $f4 -/* 94062C 8024107C 44821000 */ mtc1 $v0, $f2 -/* 940630 80241080 00000000 */ nop -/* 940634 80241084 468010A0 */ cvt.s.w $f2, $f2 -/* 940638 80241088 46041082 */ mul.s $f2, $f2, $f4 -/* 94063C 8024108C 00000000 */ nop -/* 940640 80241090 4600E700 */ add.s $f28, $f28, $f0 -/* 940644 80241094 4602D680 */ add.s $f26, $f26, $f2 -/* 940648 80241098 0C00A8D4 */ jal cos_deg -/* 94064C 8024109C 4600B306 */ mov.s $f12, $f22 -/* 940650 802410A0 46140002 */ mul.s $f0, $f0, $f20 -/* 940654 802410A4 00000000 */ nop -/* 940658 802410A8 0220202D */ daddu $a0, $s1, $zero -/* 94065C 802410AC 0260282D */ daddu $a1, $s3, $zero -/* 940660 802410B0 4600E18D */ trunc.w.s $f6, $f28 -/* 940664 802410B4 44063000 */ mfc1 $a2, $f6 -/* 940668 802410B8 0C0B2026 */ jal set_variable -/* 94066C 802410BC 4600C601 */ sub.s $f24, $f24, $f0 -/* 940670 802410C0 0220202D */ daddu $a0, $s1, $zero -/* 940674 802410C4 4600D18D */ trunc.w.s $f6, $f26 -/* 940678 802410C8 44063000 */ mfc1 $a2, $f6 -/* 94067C 802410CC 0C0B2026 */ jal set_variable -/* 940680 802410D0 0280282D */ daddu $a1, $s4, $zero -/* 940684 802410D4 0220202D */ daddu $a0, $s1, $zero -/* 940688 802410D8 4600C18D */ trunc.w.s $f6, $f24 -/* 94068C 802410DC 44063000 */ mfc1 $a2, $f6 -/* 940690 802410E0 0C0B2026 */ jal set_variable -/* 940694 802410E4 0200282D */ daddu $a1, $s0, $zero -/* 940698 802410E8 8FBF0024 */ lw $ra, 0x24($sp) -/* 94069C 802410EC 8FB40020 */ lw $s4, 0x20($sp) -/* 9406A0 802410F0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9406A4 802410F4 8FB20018 */ lw $s2, 0x18($sp) -/* 9406A8 802410F8 8FB10014 */ lw $s1, 0x14($sp) -/* 9406AC 802410FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9406B0 80241100 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9406B4 80241104 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9406B8 80241108 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9406BC 8024110C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9406C0 80241110 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9406C4 80241114 24020002 */ addiu $v0, $zero, 2 -/* 9406C8 80241118 03E00008 */ jr $ra -/* 9406CC 8024111C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802401B4.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802401B4.s deleted file mode 100644 index 6a81602b4b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802401B4.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4 -/* 946084 802401B4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 946088 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* 94608C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* 946090 802401C0 AFBF0024 */ sw $ra, 0x24($sp) -/* 946094 802401C4 AFB40020 */ sw $s4, 0x20($sp) -/* 946098 802401C8 AFB3001C */ sw $s3, 0x1c($sp) -/* 94609C 802401CC AFB20018 */ sw $s2, 0x18($sp) -/* 9460A0 802401D0 AFB00010 */ sw $s0, 0x10($sp) -/* 9460A4 802401D4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 9460A8 802401D8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 9460AC 802401DC F7B80038 */ sdc1 $f24, 0x38($sp) -/* 9460B0 802401E0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9460B4 802401E4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9460B8 802401E8 8E30000C */ lw $s0, 0xc($s1) -/* 9460BC 802401EC 8E130000 */ lw $s3, ($s0) -/* 9460C0 802401F0 26100004 */ addiu $s0, $s0, 4 -/* 9460C4 802401F4 0C0B1EAF */ jal get_variable -/* 9460C8 802401F8 0260282D */ daddu $a1, $s3, $zero -/* 9460CC 802401FC 4482E000 */ mtc1 $v0, $f28 -/* 9460D0 80240200 00000000 */ nop -/* 9460D4 80240204 4680E720 */ cvt.s.w $f28, $f28 -/* 9460D8 80240208 8E140000 */ lw $s4, ($s0) -/* 9460DC 8024020C 26100004 */ addiu $s0, $s0, 4 -/* 9460E0 80240210 0220202D */ daddu $a0, $s1, $zero -/* 9460E4 80240214 0C0B1EAF */ jal get_variable -/* 9460E8 80240218 0280282D */ daddu $a1, $s4, $zero -/* 9460EC 8024021C 4482D000 */ mtc1 $v0, $f26 -/* 9460F0 80240220 00000000 */ nop -/* 9460F4 80240224 4680D6A0 */ cvt.s.w $f26, $f26 -/* 9460F8 80240228 8E100000 */ lw $s0, ($s0) -/* 9460FC 8024022C 0220202D */ daddu $a0, $s1, $zero -/* 946100 80240230 0C0B1EAF */ jal get_variable -/* 946104 80240234 0200282D */ daddu $a1, $s0, $zero -/* 946108 80240238 4482C000 */ mtc1 $v0, $f24 -/* 94610C 8024023C 00000000 */ nop -/* 946110 80240240 4680C620 */ cvt.s.w $f24, $f24 -/* 946114 80240244 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 946118 80240248 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 94611C 8024024C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 946120 80240250 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 946124 80240254 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 946128 80240258 44800000 */ mtc1 $zero, $f0 -/* 94612C 8024025C 00031080 */ sll $v0, $v1, 2 -/* 946130 80240260 00431021 */ addu $v0, $v0, $v1 -/* 946134 80240264 00021080 */ sll $v0, $v0, 2 -/* 946138 80240268 00431023 */ subu $v0, $v0, $v1 -/* 94613C 8024026C 000218C0 */ sll $v1, $v0, 3 -/* 946140 80240270 00431021 */ addu $v0, $v0, $v1 -/* 946144 80240274 000210C0 */ sll $v0, $v0, 3 -/* 946148 80240278 46001032 */ c.eq.s $f2, $f0 -/* 94614C 8024027C 3C01800B */ lui $at, 0x800b -/* 946150 80240280 00220821 */ addu $at, $at, $v0 -/* 946154 80240284 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 946158 80240288 45000005 */ bc1f .L802402A0 -/* 94615C 8024028C 00000000 */ nop -/* 946160 80240290 3C0142C8 */ lui $at, 0x42c8 -/* 946164 80240294 44810000 */ mtc1 $at, $f0 -/* 946168 80240298 080900AC */ j .L802402B0 -/* 94616C 8024029C 4600B581 */ sub.s $f22, $f22, $f0 -.L802402A0: -/* 946170 802402A0 3C0142C8 */ lui $at, 0x42c8 -/* 946174 802402A4 44810000 */ mtc1 $at, $f0 -/* 946178 802402A8 00000000 */ nop -/* 94617C 802402AC 4600B580 */ add.s $f22, $f22, $f0 -.L802402B0: -/* 946180 802402B0 0C00A6C9 */ jal clamp_angle -/* 946184 802402B4 4600B306 */ mov.s $f12, $f22 -/* 946188 802402B8 46000586 */ mov.s $f22, $f0 -/* 94618C 802402BC 3C014170 */ lui $at, 0x4170 -/* 946190 802402C0 4481A000 */ mtc1 $at, $f20 -/* 946194 802402C4 0C00A8BB */ jal sin_deg -/* 946198 802402C8 4600B306 */ mov.s $f12, $f22 -/* 94619C 802402CC 46140002 */ mul.s $f0, $f0, $f20 -/* 9461A0 802402D0 00000000 */ nop -/* 9461A4 802402D4 864200B0 */ lh $v0, 0xb0($s2) -/* 9461A8 802402D8 3C013F00 */ lui $at, 0x3f00 -/* 9461AC 802402DC 44812000 */ mtc1 $at, $f4 -/* 9461B0 802402E0 44821000 */ mtc1 $v0, $f2 -/* 9461B4 802402E4 00000000 */ nop -/* 9461B8 802402E8 468010A0 */ cvt.s.w $f2, $f2 -/* 9461BC 802402EC 46041082 */ mul.s $f2, $f2, $f4 -/* 9461C0 802402F0 00000000 */ nop -/* 9461C4 802402F4 4600E700 */ add.s $f28, $f28, $f0 -/* 9461C8 802402F8 4602D680 */ add.s $f26, $f26, $f2 -/* 9461CC 802402FC 0C00A8D4 */ jal cos_deg -/* 9461D0 80240300 4600B306 */ mov.s $f12, $f22 -/* 9461D4 80240304 46140002 */ mul.s $f0, $f0, $f20 -/* 9461D8 80240308 00000000 */ nop -/* 9461DC 8024030C 0220202D */ daddu $a0, $s1, $zero -/* 9461E0 80240310 0260282D */ daddu $a1, $s3, $zero -/* 9461E4 80240314 4600E18D */ trunc.w.s $f6, $f28 -/* 9461E8 80240318 44063000 */ mfc1 $a2, $f6 -/* 9461EC 8024031C 0C0B2026 */ jal set_variable -/* 9461F0 80240320 4600C601 */ sub.s $f24, $f24, $f0 -/* 9461F4 80240324 0220202D */ daddu $a0, $s1, $zero -/* 9461F8 80240328 4600D18D */ trunc.w.s $f6, $f26 -/* 9461FC 8024032C 44063000 */ mfc1 $a2, $f6 -/* 946200 80240330 0C0B2026 */ jal set_variable -/* 946204 80240334 0280282D */ daddu $a1, $s4, $zero -/* 946208 80240338 0220202D */ daddu $a0, $s1, $zero -/* 94620C 8024033C 4600C18D */ trunc.w.s $f6, $f24 -/* 946210 80240340 44063000 */ mfc1 $a2, $f6 -/* 946214 80240344 0C0B2026 */ jal set_variable -/* 946218 80240348 0200282D */ daddu $a1, $s0, $zero -/* 94621C 8024034C 8FBF0024 */ lw $ra, 0x24($sp) -/* 946220 80240350 8FB40020 */ lw $s4, 0x20($sp) -/* 946224 80240354 8FB3001C */ lw $s3, 0x1c($sp) -/* 946228 80240358 8FB20018 */ lw $s2, 0x18($sp) -/* 94622C 8024035C 8FB10014 */ lw $s1, 0x14($sp) -/* 946230 80240360 8FB00010 */ lw $s0, 0x10($sp) -/* 946234 80240364 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 946238 80240368 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 94623C 8024036C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 946240 80240370 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 946244 80240374 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 946248 80240378 24020002 */ addiu $v0, $zero, 2 -/* 94624C 8024037C 03E00008 */ jr $ra -/* 946250 80240380 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC.s index c22139a188..89a23e2b3b 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC.s @@ -77,7 +77,7 @@ glabel func_802426FC /* 87C3F4 80242814 0260302D */ daddu $a2, $s3, $zero /* 87C3F8 80242818 0280202D */ daddu $a0, $s4, $zero /* 87C3FC 8024281C 0200282D */ daddu $a1, $s0, $zero -/* 87C400 80242820 0C090568 */ jal func_802415A0 +/* 87C400 80242820 0C090568 */ jal func_802415A0_87B180 /* 87C404 80242824 0260302D */ daddu $a2, $s3, $zero /* 87C408 80242828 08090A31 */ j .L802428C4 /* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero diff --git a/include/common_structs.h b/include/common_structs.h index a8e1b8aec0..ef4414b63d 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -169,7 +169,7 @@ typedef struct PlayerData { /* 0x2C2 */ s16 quizzesCorrect; /* 0x2C4 */ s32 unk_2C4[12]; /* 0x2F4 */ s32 unk_2F4[12]; - /* 0x324 */ char unk_324; + /* 0x324 */ s32 tradeEventStartTime; /* 0x328 */ s32 unk_328; /* 0x32C */ s16 starPiecesCollected; /* 0x32E */ s16 jumpGamePlays; diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 58d16843f4..70424a642c 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802412B0_BE0040); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80241424_BE01B4); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802415F4_BE0384); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 9fe046100c..4d22a93675 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802424D4); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242560); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242730); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 3cca6f5ca5..166c363390 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243068); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802430F0); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802432C0); diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 534152aea9..1e3abc0bb1 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_8024150C_CB024C); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802417A0_CB04E0); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241970_CB06B0); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 8671de2d04..45d71412a2 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024027C_CC10AC); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_802403F0_CC1220); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_802405C0_CC13F0); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index d25ba3b46d..7e8417f870 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241E1C); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242064); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242234); diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index e1bdd74c92..acd67261d2 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_8024009C_CEE2FC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_8024026C_CEE4CC); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 5a8ac30758..3328f27bee 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241944_CF4514); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241B88); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241D58); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index effb7c11df..9a3f10c245 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240310_A397F0); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240484); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34); diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index d56ed2b2fd..e04cc2dcc0 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240DAC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C); diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c index 1209f90576..8207525268 100644 --- a/src/world/area_iwa/iwa_10/91F5A0.c +++ b/src/world/area_iwa/iwa_10/91F5A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241030); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241210_91F780); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802413E0); diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index f1198a8965..94b389c691 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802403F4_B20934); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240568_B20AA8); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240738_B20C78); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 97030443bc..9210b5e919 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240FC4); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024131C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 5806b2ceff..93a62caf3a 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -68,7 +68,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241808); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8); diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index 75713e252e..5d1dc1a867 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024039C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024056C_AF320C); diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index 040f4cac4d..7e7a7dba68 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_8024030C_AF7C5C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802404DC_AF7E2C); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 8f7ab89bb5..a28fe4a31a 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -96,7 +96,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024209C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C); diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c index 66eb07e311..8418311b5d 100644 --- a/src/world/area_kpa/kpa_81/A78510.c +++ b/src/world/area_kpa/kpa_81/A78510.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802400AC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C); diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c index a6cd71f370..54cc956d4b 100644 --- a/src/world/area_kpa/kpa_82/A7A550.c +++ b/src/world/area_kpa/kpa_82/A7A550.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802400AC_A7A5AC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index ee4d270705..693226c1c9 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241FCC_C5C70C); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242140); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242310); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 7123b7a34b..3467ed289b 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024259C_C632AC); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242710_C63420); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802428E0_C635F0); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index d0ae10d275..e993546db1 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243420); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802435F0); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 3b03c54671..3777dd8cfe 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024259C_C8804C); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242710_C881C0); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802428E0_C88390); diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index 8922acb477..f3e19f1d76 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241468); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802415DC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802417AC_C8F35C); diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index 25f807e2ab..98974d85ea 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240310_C96240); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240484_C963B4); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240654_C96584); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index ba836bc5ed..97dc53eba3 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241694); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241720); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index e6331ba3ba..37ee6da685 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243574); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index a721a4357c..fff65c2621 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -120,7 +120,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243AA0); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243B04); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index a6210ee890..82564b747c 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242824); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802428B0); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index adbcc8b806..c478247470 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241514); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802415A0); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 95f114bb6c..0a7d1840a5 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802414C4_844094); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241550); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 573b3ef4f4..eaba5756fd 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242384_8544F4); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242410); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0); diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index cbabcc3626..5ac51dc59b 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240C60_B98860); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240EE0_B98AE0); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802410B0_B98CB0); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index b93969e6b3..8b1d0cb012 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -100,7 +100,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DCC); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241E58); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408); diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 92af54ad51..81abb6740e 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240454); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index f1f7ec29dc..85e5bbacce 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242974); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242A00_9D9A20); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0); diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index d61cf24dfb..c3d6065933 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802438D0); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243A1C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC); diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index 599931f128..d4b44b3bf9 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802407E0_BBD980); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240954_BBDAF4); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24); diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 24033158bc..3dc51e799f 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240170_BC43F0); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802402E4); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 4d9f8a97e5..a3bd1769ac 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241D60_DB4020); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241FA8); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index c810e57835..3a4d3a2e8e 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240A00_DE2E90); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240D30_DE31C0); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390); diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index 8e93c07f03..d44773f40d 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240360_AB0350); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802404D4_AB04C4); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406A4_AB0694); diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index 247de0d830..11e2ec3a1e 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F60_D4DFA0); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240FDC_D4E01C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC); diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index c99cbd6ac5..11c28fc0d2 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EEC_D50EDC); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240F7C_D50F6C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_8024114C_D5113C); diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index 5c2e367a36..c9474d6cd7 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EEC_D5977C); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240F7C_D5980C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC); diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 63d8f727c5..a82b9bc879 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EEC_D654CC); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240F7C_D6555C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 1ca09b200d..96747c2d43 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EEC_D6F89C); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240F7C_D6F92C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC); diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c index 0797433953..8d55fa228f 100644 --- a/src/world/area_pra/pra_31/D7ED80.c +++ b/src/world/area_pra/pra_31/D7ED80.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024007C_D7EDDC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index c56582569c..35a244aeb7 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024036C_CF7EDC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C); diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c index c26ae43416..6d9ba4283c 100644 --- a/src/world/area_sam/sam_04/D138E0.c +++ b/src/world/area_sam/sam_04/D138E0.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024036C_D1393C); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 6fd7b273b5..e19bb37d64 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241BBC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C); diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index 88df07ca65..f7802ba8f6 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -2,7 +2,7 @@ #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024074C_92A9FC); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 68b28dd57c..fbed1b72b3 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240DDC_94038C); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240F50_940500); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241120_9406D0); diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index 6260d9eaac..64a480c16d 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240040_945F10); #include "world/common/GetNpcCollisionHeight.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802401B4); +#include "world/common/SomeXYZFuncTodoRename.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240384_946254); diff --git a/src/world/common/SomeXYZFuncTodoRename.inc.c b/src/world/common/SomeXYZFuncTodoRename.inc.c new file mode 100644 index 0000000000..a9276c6c94 --- /dev/null +++ b/src/world/common/SomeXYZFuncTodoRename.inc.c @@ -0,0 +1,32 @@ +#include "common.h" + +static ApiStatus SomeXYZFuncTodoRename(ScriptInstance *script) { + PlayerStatus* playerStatus = PLAYER_STATUS; + Bytecode* args = script->ptrReadPos; + s32 xVar = *args++; + f32 x = (f32)get_variable(script, xVar); + s32 yVar = *args++; + f32 y = (f32)get_variable(script, yVar); + s32 zVar = *args++; + f32 z = (f32)get_variable(script, zVar); + f32 cameraYaw; + + cameraYaw = gCameras[gCurrentCameraID].currentYaw; + + if (playerStatus->spriteFacingAngle == 0.0f) { + cameraYaw -= 100.0f; + } else { + cameraYaw += 100.0f; + } + cameraYaw = clamp_angle(cameraYaw); + + x += sin_deg(cameraYaw) * 15.0f; + y += playerStatus->colliderHeight * 0.5f; + z -= cos_deg(cameraYaw) * 15.0f; + + set_variable(script, xVar, x); + set_variable(script, yVar, y); + set_variable(script, zVar, z); + + return ApiStatus_DONE2; +}