From 7cd29aa5114eadc3746a0946a79b95eeea23692f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 31 Dec 2020 17:25:05 +0900 Subject: [PATCH] UnkFloatFunc --- .../area_flo/5B16A0/func_802181F0_5B16A0.s | 105 ----------------- .../area_flo/5B16A0/func_80219960_5B2E10.s | 105 ----------------- .../area_flo/5B16A0/func_80219AF0_5B2FA0.s | 105 ----------------- .../area_flo2/5CE690/func_80218114_5CE7A4.s | 105 ----------------- .../area_flo2/5CF2D0/func_80218C40_5CF2D0.s | 105 ----------------- .../area_flo2/5CF2D0/func_80219310_5CF9A0.s | 105 ----------------- .../area_flo2/5CF2D0/func_802194A0_5CFB30.s | 105 ----------------- .../area_kpa/684C30/func_80218358_684D88.s | 105 ----------------- .../area_kpa4/6CC1C0/func_802182A8_6CC318.s | 105 ----------------- .../area_pra2/660750/func_80218058_6607A8.s | 105 ----------------- .../flo_00/C9EE30/func_802411EC_C9F10C.s | 105 ----------------- .../flo_18/CDC6A0/func_80240394_CDCA34.s | 108 ------------------ .../flo_19/CE36F0/func_802407B0_CE3EA0.s | 105 ----------------- .../flo_21/CE7240/func_80240B40_CE7240.s | 105 ----------------- .../iwa_10/91E6D0/func_80240160_91E6D0.s | 105 ----------------- .../iwa_11/926A10/func_80240020_926A10.s | 105 ----------------- .../mac_03/831B20/func_80240320_831B20.s | 105 ----------------- .../nok_01/9C53E0/func_80242514_9C78F4.s | 105 ----------------- .../nok_04/9EDBF0/func_80240184_9EDD74.s | 105 ----------------- .../omo_03/DA5260/func_802403A8_DA55E8.s | 105 ----------------- .../omo_06/DB7910/func_80240388_DB7C98.s | 105 ----------------- .../omo_08/DC43D0/func_80240388_DC4758.s | 105 ----------------- .../omo_10/DD79B0/func_80240388_DD7D38.s | 105 ----------------- .../omo_16/DEBED0/func_80240388_DEC258.s | 105 ----------------- .../omo_17/DEEEA0/func_80240388_DEF228.s | 105 ----------------- src/battle/area_flo/5B16A0.c | 10 +- src/battle/area_flo2/5CE690.c | 2 +- src/battle/area_flo2/5CF2D0.c | 12 +- src/battle/area_kpa/684C30.c | 2 +- src/battle/area_kpa4/6CC1C0.c | 2 +- src/battle/area_pra2/660750.c | 2 +- src/common/UnkFloatFunc.inc.c | 24 ++++ src/world/area_flo/flo_00/C9EE30.c | 2 +- src/world/area_flo/flo_18/CDC6A0.c | 2 +- src/world/area_flo/flo_19/CE36F0.c | 2 +- src/world/area_flo/flo_21/CE7240.c | 2 +- src/world/area_iwa/iwa_10/91E6D0.c | 2 +- src/world/area_iwa/iwa_11/926A10.c | 2 +- src/world/area_mac/mac_03/831B20.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_nok/nok_04/9EDBF0.c | 2 +- src/world/area_omo/omo_03/DA5260.c | 2 +- src/world/area_omo/omo_06/DB7910.c | 2 +- src/world/area_omo/omo_08/DC43D0.c | 2 +- src/world/area_omo/omo_10/DD79B0.c | 2 +- src/world/area_omo/omo_16/DEBED0.c | 2 +- src/world/area_omo/omo_17/DEEEA0.c | 2 +- 47 files changed, 59 insertions(+), 2653 deletions(-) delete mode 100644 asm/nonmatchings/battle/area_flo/5B16A0/func_802181F0_5B16A0.s delete mode 100644 asm/nonmatchings/battle/area_flo/5B16A0/func_80219960_5B2E10.s delete mode 100644 asm/nonmatchings/battle/area_flo/5B16A0/func_80219AF0_5B2FA0.s delete mode 100644 asm/nonmatchings/battle/area_flo2/5CE690/func_80218114_5CE7A4.s delete mode 100644 asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218C40_5CF2D0.s delete mode 100644 asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219310_5CF9A0.s delete mode 100644 asm/nonmatchings/battle/area_flo2/5CF2D0/func_802194A0_5CFB30.s delete mode 100644 asm/nonmatchings/battle/area_kpa/684C30/func_80218358_684D88.s delete mode 100644 asm/nonmatchings/battle/area_kpa4/6CC1C0/func_802182A8_6CC318.s delete mode 100644 asm/nonmatchings/battle/area_pra2/660750/func_80218058_6607A8.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802411EC_C9F10C.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240394_CDCA34.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_802407B0_CE3EA0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40_CE7240.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240160_91E6D0.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240020_926A10.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320_831B20.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242514_9C78F4.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240184_9EDD74.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802403A8_DA55E8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240388_DB7C98.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240388_DC4758.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240388_DD7D38.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240388_DEC258.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240388_DEF228.s create mode 100644 src/common/UnkFloatFunc.inc.c diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802181F0_5B16A0.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_802181F0_5B16A0.s deleted file mode 100644 index 7644d1f4a6..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_802181F0_5B16A0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802181F0_5B16A0 -/* 5B16A0 802181F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 5B16A4 802181F4 AFB20018 */ sw $s2, 0x18($sp) -/* 5B16A8 802181F8 0080902D */ daddu $s2, $a0, $zero -/* 5B16AC 802181FC AFBF0028 */ sw $ra, 0x28($sp) -/* 5B16B0 80218200 AFB50024 */ sw $s5, 0x24($sp) -/* 5B16B4 80218204 AFB40020 */ sw $s4, 0x20($sp) -/* 5B16B8 80218208 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B16BC 8021820C AFB10014 */ sw $s1, 0x14($sp) -/* 5B16C0 80218210 AFB00010 */ sw $s0, 0x10($sp) -/* 5B16C4 80218214 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 5B16C8 80218218 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 5B16CC 8021821C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 5B16D0 80218220 8E50000C */ lw $s0, 0xc($s2) -/* 5B16D4 80218224 8E140000 */ lw $s4, ($s0) -/* 5B16D8 80218228 26100004 */ addiu $s0, $s0, 4 -/* 5B16DC 8021822C 0C0B1EAF */ jal get_variable -/* 5B16E0 80218230 0280282D */ daddu $a1, $s4, $zero -/* 5B16E4 80218234 0040982D */ daddu $s3, $v0, $zero -/* 5B16E8 80218238 8E150000 */ lw $s5, ($s0) -/* 5B16EC 8021823C 26100004 */ addiu $s0, $s0, 4 -/* 5B16F0 80218240 8E050000 */ lw $a1, ($s0) -/* 5B16F4 80218244 26100004 */ addiu $s0, $s0, 4 -/* 5B16F8 80218248 0C0B210B */ jal get_float_variable -/* 5B16FC 8021824C 0240202D */ daddu $a0, $s2, $zero -/* 5B1700 80218250 8E050000 */ lw $a1, ($s0) -/* 5B1704 80218254 26100004 */ addiu $s0, $s0, 4 -/* 5B1708 80218258 0240202D */ daddu $a0, $s2, $zero -/* 5B170C 8021825C 0C0B210B */ jal get_float_variable -/* 5B1710 80218260 46000606 */ mov.s $f24, $f0 -/* 5B1714 80218264 8E050000 */ lw $a1, ($s0) -/* 5B1718 80218268 26100004 */ addiu $s0, $s0, 4 -/* 5B171C 8021826C 0240202D */ daddu $a0, $s2, $zero -/* 5B1720 80218270 0C0B1EAF */ jal get_variable -/* 5B1724 80218274 46000506 */ mov.s $f20, $f0 -/* 5B1728 80218278 8E050000 */ lw $a1, ($s0) -/* 5B172C 8021827C 26100004 */ addiu $s0, $s0, 4 -/* 5B1730 80218280 0240202D */ daddu $a0, $s2, $zero -/* 5B1734 80218284 0C0B1EAF */ jal get_variable -/* 5B1738 80218288 0040882D */ daddu $s1, $v0, $zero -/* 5B173C 8021828C 0240202D */ daddu $a0, $s2, $zero -/* 5B1740 80218290 8E050000 */ lw $a1, ($s0) -/* 5B1744 80218294 0C0B210B */ jal get_float_variable -/* 5B1748 80218298 0040802D */ daddu $s0, $v0, $zero -/* 5B174C 8021829C 3C014334 */ lui $at, 0x4334 -/* 5B1750 802182A0 44811000 */ mtc1 $at, $f2 -/* 5B1754 802182A4 3C014049 */ lui $at, 0x4049 -/* 5B1758 802182A8 34210FD8 */ ori $at, $at, 0xfd8 -/* 5B175C 802182AC 44812000 */ mtc1 $at, $f4 -/* 5B1760 802182B0 46020003 */ div.s $f0, $f0, $f2 -/* 5B1764 802182B4 46040582 */ mul.s $f22, $f0, $f4 -/* 5B1768 802182B8 00000000 */ nop -/* 5B176C 802182BC 4618A501 */ sub.s $f20, $f20, $f24 -/* 5B1770 802182C0 3C013F00 */ lui $at, 0x3f00 -/* 5B1774 802182C4 44810000 */ mtc1 $at, $f0 -/* 5B1778 802182C8 00000000 */ nop -/* 5B177C 802182CC 4600A502 */ mul.s $f20, $f20, $f0 -/* 5B1780 802182D0 00000000 */ nop -/* 5B1784 802182D4 12000007 */ beqz $s0, .L802182F4 -/* 5B1788 802182D8 0233102A */ slt $v0, $s1, $s3 -/* 5B178C 802182DC 10400005 */ beqz $v0, .L802182F4 -/* 5B1790 802182E0 0240202D */ daddu $a0, $s2, $zero -/* 5B1794 802182E4 0220982D */ daddu $s3, $s1, $zero -/* 5B1798 802182E8 0280282D */ daddu $a1, $s4, $zero -/* 5B179C 802182EC 0C0B2026 */ jal set_variable -/* 5B17A0 802182F0 0220302D */ daddu $a2, $s1, $zero -.L802182F4: -/* 5B17A4 802182F4 3C014049 */ lui $at, 0x4049 -/* 5B17A8 802182F8 34210FD8 */ ori $at, $at, 0xfd8 -/* 5B17AC 802182FC 44810000 */ mtc1 $at, $f0 -/* 5B17B0 80218300 44936000 */ mtc1 $s3, $f12 -/* 5B17B4 80218304 00000000 */ nop -/* 5B17B8 80218308 46806320 */ cvt.s.w $f12, $f12 -/* 5B17BC 8021830C 46006302 */ mul.s $f12, $f12, $f0 -/* 5B17C0 80218310 00000000 */ nop -/* 5B17C4 80218314 44910000 */ mtc1 $s1, $f0 -/* 5B17C8 80218318 00000000 */ nop -/* 5B17CC 8021831C 46800020 */ cvt.s.w $f0, $f0 -/* 5B17D0 80218320 46006303 */ div.s $f12, $f12, $f0 -/* 5B17D4 80218324 0C00A874 */ jal cos_rad -/* 5B17D8 80218328 46166300 */ add.s $f12, $f12, $f22 -/* 5B17DC 8021832C 4600A002 */ mul.s $f0, $f20, $f0 -/* 5B17E0 80218330 00000000 */ nop -/* 5B17E4 80218334 4614C080 */ add.s $f2, $f24, $f20 -/* 5B17E8 80218338 46001081 */ sub.s $f2, $f2, $f0 -/* 5B17EC 8021833C 0240202D */ daddu $a0, $s2, $zero -/* 5B17F0 80218340 44061000 */ mfc1 $a2, $f2 -/* 5B17F4 80218344 0C0B2190 */ jal set_float_variable -/* 5B17F8 80218348 02A0282D */ daddu $a1, $s5, $zero -/* 5B17FC 8021834C 8FBF0028 */ lw $ra, 0x28($sp) -/* 5B1800 80218350 8FB50024 */ lw $s5, 0x24($sp) -/* 5B1804 80218354 8FB40020 */ lw $s4, 0x20($sp) -/* 5B1808 80218358 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B180C 8021835C 8FB20018 */ lw $s2, 0x18($sp) -/* 5B1810 80218360 8FB10014 */ lw $s1, 0x14($sp) -/* 5B1814 80218364 8FB00010 */ lw $s0, 0x10($sp) -/* 5B1818 80218368 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 5B181C 8021836C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 5B1820 80218370 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 5B1824 80218374 24020002 */ addiu $v0, $zero, 2 -/* 5B1828 80218378 03E00008 */ jr $ra -/* 5B182C 8021837C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219960_5B2E10.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219960_5B2E10.s deleted file mode 100644 index 091cb3f33f..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219960_5B2E10.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219960_5B2E10 -/* 5B2E10 80219960 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 5B2E14 80219964 AFB20018 */ sw $s2, 0x18($sp) -/* 5B2E18 80219968 0080902D */ daddu $s2, $a0, $zero -/* 5B2E1C 8021996C AFBF0028 */ sw $ra, 0x28($sp) -/* 5B2E20 80219970 AFB50024 */ sw $s5, 0x24($sp) -/* 5B2E24 80219974 AFB40020 */ sw $s4, 0x20($sp) -/* 5B2E28 80219978 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B2E2C 8021997C AFB10014 */ sw $s1, 0x14($sp) -/* 5B2E30 80219980 AFB00010 */ sw $s0, 0x10($sp) -/* 5B2E34 80219984 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 5B2E38 80219988 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 5B2E3C 8021998C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 5B2E40 80219990 8E50000C */ lw $s0, 0xc($s2) -/* 5B2E44 80219994 8E140000 */ lw $s4, ($s0) -/* 5B2E48 80219998 26100004 */ addiu $s0, $s0, 4 -/* 5B2E4C 8021999C 0C0B1EAF */ jal get_variable -/* 5B2E50 802199A0 0280282D */ daddu $a1, $s4, $zero -/* 5B2E54 802199A4 0040982D */ daddu $s3, $v0, $zero -/* 5B2E58 802199A8 8E150000 */ lw $s5, ($s0) -/* 5B2E5C 802199AC 26100004 */ addiu $s0, $s0, 4 -/* 5B2E60 802199B0 8E050000 */ lw $a1, ($s0) -/* 5B2E64 802199B4 26100004 */ addiu $s0, $s0, 4 -/* 5B2E68 802199B8 0C0B210B */ jal get_float_variable -/* 5B2E6C 802199BC 0240202D */ daddu $a0, $s2, $zero -/* 5B2E70 802199C0 8E050000 */ lw $a1, ($s0) -/* 5B2E74 802199C4 26100004 */ addiu $s0, $s0, 4 -/* 5B2E78 802199C8 0240202D */ daddu $a0, $s2, $zero -/* 5B2E7C 802199CC 0C0B210B */ jal get_float_variable -/* 5B2E80 802199D0 46000606 */ mov.s $f24, $f0 -/* 5B2E84 802199D4 8E050000 */ lw $a1, ($s0) -/* 5B2E88 802199D8 26100004 */ addiu $s0, $s0, 4 -/* 5B2E8C 802199DC 0240202D */ daddu $a0, $s2, $zero -/* 5B2E90 802199E0 0C0B1EAF */ jal get_variable -/* 5B2E94 802199E4 46000506 */ mov.s $f20, $f0 -/* 5B2E98 802199E8 8E050000 */ lw $a1, ($s0) -/* 5B2E9C 802199EC 26100004 */ addiu $s0, $s0, 4 -/* 5B2EA0 802199F0 0240202D */ daddu $a0, $s2, $zero -/* 5B2EA4 802199F4 0C0B1EAF */ jal get_variable -/* 5B2EA8 802199F8 0040882D */ daddu $s1, $v0, $zero -/* 5B2EAC 802199FC 0240202D */ daddu $a0, $s2, $zero -/* 5B2EB0 80219A00 8E050000 */ lw $a1, ($s0) -/* 5B2EB4 80219A04 0C0B210B */ jal get_float_variable -/* 5B2EB8 80219A08 0040802D */ daddu $s0, $v0, $zero -/* 5B2EBC 80219A0C 3C014334 */ lui $at, 0x4334 -/* 5B2EC0 80219A10 44811000 */ mtc1 $at, $f2 -/* 5B2EC4 80219A14 3C014049 */ lui $at, 0x4049 -/* 5B2EC8 80219A18 34210FD8 */ ori $at, $at, 0xfd8 -/* 5B2ECC 80219A1C 44812000 */ mtc1 $at, $f4 -/* 5B2ED0 80219A20 46020003 */ div.s $f0, $f0, $f2 -/* 5B2ED4 80219A24 46040582 */ mul.s $f22, $f0, $f4 -/* 5B2ED8 80219A28 00000000 */ nop -/* 5B2EDC 80219A2C 4618A501 */ sub.s $f20, $f20, $f24 -/* 5B2EE0 80219A30 3C013F00 */ lui $at, 0x3f00 -/* 5B2EE4 80219A34 44810000 */ mtc1 $at, $f0 -/* 5B2EE8 80219A38 00000000 */ nop -/* 5B2EEC 80219A3C 4600A502 */ mul.s $f20, $f20, $f0 -/* 5B2EF0 80219A40 00000000 */ nop -/* 5B2EF4 80219A44 12000007 */ beqz $s0, .L80219A64 -/* 5B2EF8 80219A48 0233102A */ slt $v0, $s1, $s3 -/* 5B2EFC 80219A4C 10400005 */ beqz $v0, .L80219A64 -/* 5B2F00 80219A50 0240202D */ daddu $a0, $s2, $zero -/* 5B2F04 80219A54 0220982D */ daddu $s3, $s1, $zero -/* 5B2F08 80219A58 0280282D */ daddu $a1, $s4, $zero -/* 5B2F0C 80219A5C 0C0B2026 */ jal set_variable -/* 5B2F10 80219A60 0220302D */ daddu $a2, $s1, $zero -.L80219A64: -/* 5B2F14 80219A64 3C014049 */ lui $at, 0x4049 -/* 5B2F18 80219A68 34210FD8 */ ori $at, $at, 0xfd8 -/* 5B2F1C 80219A6C 44810000 */ mtc1 $at, $f0 -/* 5B2F20 80219A70 44936000 */ mtc1 $s3, $f12 -/* 5B2F24 80219A74 00000000 */ nop -/* 5B2F28 80219A78 46806320 */ cvt.s.w $f12, $f12 -/* 5B2F2C 80219A7C 46006302 */ mul.s $f12, $f12, $f0 -/* 5B2F30 80219A80 00000000 */ nop -/* 5B2F34 80219A84 44910000 */ mtc1 $s1, $f0 -/* 5B2F38 80219A88 00000000 */ nop -/* 5B2F3C 80219A8C 46800020 */ cvt.s.w $f0, $f0 -/* 5B2F40 80219A90 46006303 */ div.s $f12, $f12, $f0 -/* 5B2F44 80219A94 0C00A874 */ jal cos_rad -/* 5B2F48 80219A98 46166300 */ add.s $f12, $f12, $f22 -/* 5B2F4C 80219A9C 4600A002 */ mul.s $f0, $f20, $f0 -/* 5B2F50 80219AA0 00000000 */ nop -/* 5B2F54 80219AA4 4614C080 */ add.s $f2, $f24, $f20 -/* 5B2F58 80219AA8 46001081 */ sub.s $f2, $f2, $f0 -/* 5B2F5C 80219AAC 0240202D */ daddu $a0, $s2, $zero -/* 5B2F60 80219AB0 44061000 */ mfc1 $a2, $f2 -/* 5B2F64 80219AB4 0C0B2190 */ jal set_float_variable -/* 5B2F68 80219AB8 02A0282D */ daddu $a1, $s5, $zero -/* 5B2F6C 80219ABC 8FBF0028 */ lw $ra, 0x28($sp) -/* 5B2F70 80219AC0 8FB50024 */ lw $s5, 0x24($sp) -/* 5B2F74 80219AC4 8FB40020 */ lw $s4, 0x20($sp) -/* 5B2F78 80219AC8 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B2F7C 80219ACC 8FB20018 */ lw $s2, 0x18($sp) -/* 5B2F80 80219AD0 8FB10014 */ lw $s1, 0x14($sp) -/* 5B2F84 80219AD4 8FB00010 */ lw $s0, 0x10($sp) -/* 5B2F88 80219AD8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 5B2F8C 80219ADC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 5B2F90 80219AE0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 5B2F94 80219AE4 24020002 */ addiu $v0, $zero, 2 -/* 5B2F98 80219AE8 03E00008 */ jr $ra -/* 5B2F9C 80219AEC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219AF0_5B2FA0.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219AF0_5B2FA0.s deleted file mode 100644 index 0c8e06d238..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219AF0_5B2FA0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219AF0_5B2FA0 -/* 5B2FA0 80219AF0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 5B2FA4 80219AF4 AFB20018 */ sw $s2, 0x18($sp) -/* 5B2FA8 80219AF8 0080902D */ daddu $s2, $a0, $zero -/* 5B2FAC 80219AFC AFBF0028 */ sw $ra, 0x28($sp) -/* 5B2FB0 80219B00 AFB50024 */ sw $s5, 0x24($sp) -/* 5B2FB4 80219B04 AFB40020 */ sw $s4, 0x20($sp) -/* 5B2FB8 80219B08 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B2FBC 80219B0C AFB10014 */ sw $s1, 0x14($sp) -/* 5B2FC0 80219B10 AFB00010 */ sw $s0, 0x10($sp) -/* 5B2FC4 80219B14 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 5B2FC8 80219B18 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 5B2FCC 80219B1C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 5B2FD0 80219B20 8E50000C */ lw $s0, 0xc($s2) -/* 5B2FD4 80219B24 8E140000 */ lw $s4, ($s0) -/* 5B2FD8 80219B28 26100004 */ addiu $s0, $s0, 4 -/* 5B2FDC 80219B2C 0C0B1EAF */ jal get_variable -/* 5B2FE0 80219B30 0280282D */ daddu $a1, $s4, $zero -/* 5B2FE4 80219B34 0040982D */ daddu $s3, $v0, $zero -/* 5B2FE8 80219B38 8E150000 */ lw $s5, ($s0) -/* 5B2FEC 80219B3C 26100004 */ addiu $s0, $s0, 4 -/* 5B2FF0 80219B40 8E050000 */ lw $a1, ($s0) -/* 5B2FF4 80219B44 26100004 */ addiu $s0, $s0, 4 -/* 5B2FF8 80219B48 0C0B210B */ jal get_float_variable -/* 5B2FFC 80219B4C 0240202D */ daddu $a0, $s2, $zero -/* 5B3000 80219B50 8E050000 */ lw $a1, ($s0) -/* 5B3004 80219B54 26100004 */ addiu $s0, $s0, 4 -/* 5B3008 80219B58 0240202D */ daddu $a0, $s2, $zero -/* 5B300C 80219B5C 0C0B210B */ jal get_float_variable -/* 5B3010 80219B60 46000606 */ mov.s $f24, $f0 -/* 5B3014 80219B64 8E050000 */ lw $a1, ($s0) -/* 5B3018 80219B68 26100004 */ addiu $s0, $s0, 4 -/* 5B301C 80219B6C 0240202D */ daddu $a0, $s2, $zero -/* 5B3020 80219B70 0C0B1EAF */ jal get_variable -/* 5B3024 80219B74 46000506 */ mov.s $f20, $f0 -/* 5B3028 80219B78 8E050000 */ lw $a1, ($s0) -/* 5B302C 80219B7C 26100004 */ addiu $s0, $s0, 4 -/* 5B3030 80219B80 0240202D */ daddu $a0, $s2, $zero -/* 5B3034 80219B84 0C0B1EAF */ jal get_variable -/* 5B3038 80219B88 0040882D */ daddu $s1, $v0, $zero -/* 5B303C 80219B8C 0240202D */ daddu $a0, $s2, $zero -/* 5B3040 80219B90 8E050000 */ lw $a1, ($s0) -/* 5B3044 80219B94 0C0B210B */ jal get_float_variable -/* 5B3048 80219B98 0040802D */ daddu $s0, $v0, $zero -/* 5B304C 80219B9C 3C014334 */ lui $at, 0x4334 -/* 5B3050 80219BA0 44811000 */ mtc1 $at, $f2 -/* 5B3054 80219BA4 3C014049 */ lui $at, 0x4049 -/* 5B3058 80219BA8 34210FD8 */ ori $at, $at, 0xfd8 -/* 5B305C 80219BAC 44812000 */ mtc1 $at, $f4 -/* 5B3060 80219BB0 46020003 */ div.s $f0, $f0, $f2 -/* 5B3064 80219BB4 46040582 */ mul.s $f22, $f0, $f4 -/* 5B3068 80219BB8 00000000 */ nop -/* 5B306C 80219BBC 4618A501 */ sub.s $f20, $f20, $f24 -/* 5B3070 80219BC0 3C013F00 */ lui $at, 0x3f00 -/* 5B3074 80219BC4 44810000 */ mtc1 $at, $f0 -/* 5B3078 80219BC8 00000000 */ nop -/* 5B307C 80219BCC 4600A502 */ mul.s $f20, $f20, $f0 -/* 5B3080 80219BD0 00000000 */ nop -/* 5B3084 80219BD4 12000007 */ beqz $s0, .L80219BF4 -/* 5B3088 80219BD8 0233102A */ slt $v0, $s1, $s3 -/* 5B308C 80219BDC 10400005 */ beqz $v0, .L80219BF4 -/* 5B3090 80219BE0 0240202D */ daddu $a0, $s2, $zero -/* 5B3094 80219BE4 0220982D */ daddu $s3, $s1, $zero -/* 5B3098 80219BE8 0280282D */ daddu $a1, $s4, $zero -/* 5B309C 80219BEC 0C0B2026 */ jal set_variable -/* 5B30A0 80219BF0 0220302D */ daddu $a2, $s1, $zero -.L80219BF4: -/* 5B30A4 80219BF4 3C014049 */ lui $at, 0x4049 -/* 5B30A8 80219BF8 34210FD8 */ ori $at, $at, 0xfd8 -/* 5B30AC 80219BFC 44810000 */ mtc1 $at, $f0 -/* 5B30B0 80219C00 44936000 */ mtc1 $s3, $f12 -/* 5B30B4 80219C04 00000000 */ nop -/* 5B30B8 80219C08 46806320 */ cvt.s.w $f12, $f12 -/* 5B30BC 80219C0C 46006302 */ mul.s $f12, $f12, $f0 -/* 5B30C0 80219C10 00000000 */ nop -/* 5B30C4 80219C14 44910000 */ mtc1 $s1, $f0 -/* 5B30C8 80219C18 00000000 */ nop -/* 5B30CC 80219C1C 46800020 */ cvt.s.w $f0, $f0 -/* 5B30D0 80219C20 46006303 */ div.s $f12, $f12, $f0 -/* 5B30D4 80219C24 0C00A874 */ jal cos_rad -/* 5B30D8 80219C28 46166300 */ add.s $f12, $f12, $f22 -/* 5B30DC 80219C2C 4600A002 */ mul.s $f0, $f20, $f0 -/* 5B30E0 80219C30 00000000 */ nop -/* 5B30E4 80219C34 4614C080 */ add.s $f2, $f24, $f20 -/* 5B30E8 80219C38 46001081 */ sub.s $f2, $f2, $f0 -/* 5B30EC 80219C3C 0240202D */ daddu $a0, $s2, $zero -/* 5B30F0 80219C40 44061000 */ mfc1 $a2, $f2 -/* 5B30F4 80219C44 0C0B2190 */ jal set_float_variable -/* 5B30F8 80219C48 02A0282D */ daddu $a1, $s5, $zero -/* 5B30FC 80219C4C 8FBF0028 */ lw $ra, 0x28($sp) -/* 5B3100 80219C50 8FB50024 */ lw $s5, 0x24($sp) -/* 5B3104 80219C54 8FB40020 */ lw $s4, 0x20($sp) -/* 5B3108 80219C58 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B310C 80219C5C 8FB20018 */ lw $s2, 0x18($sp) -/* 5B3110 80219C60 8FB10014 */ lw $s1, 0x14($sp) -/* 5B3114 80219C64 8FB00010 */ lw $s0, 0x10($sp) -/* 5B3118 80219C68 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 5B311C 80219C6C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 5B3120 80219C70 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 5B3124 80219C74 24020002 */ addiu $v0, $zero, 2 -/* 5B3128 80219C78 03E00008 */ jr $ra -/* 5B312C 80219C7C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218114_5CE7A4.s b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218114_5CE7A4.s deleted file mode 100644 index c87978d533..0000000000 --- a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218114_5CE7A4.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218114_5CE7A4 -/* 5CE7A4 80218114 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 5CE7A8 80218118 AFB20018 */ sw $s2, 0x18($sp) -/* 5CE7AC 8021811C 0080902D */ daddu $s2, $a0, $zero -/* 5CE7B0 80218120 AFBF0028 */ sw $ra, 0x28($sp) -/* 5CE7B4 80218124 AFB50024 */ sw $s5, 0x24($sp) -/* 5CE7B8 80218128 AFB40020 */ sw $s4, 0x20($sp) -/* 5CE7BC 8021812C AFB3001C */ sw $s3, 0x1c($sp) -/* 5CE7C0 80218130 AFB10014 */ sw $s1, 0x14($sp) -/* 5CE7C4 80218134 AFB00010 */ sw $s0, 0x10($sp) -/* 5CE7C8 80218138 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 5CE7CC 8021813C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 5CE7D0 80218140 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 5CE7D4 80218144 8E50000C */ lw $s0, 0xc($s2) -/* 5CE7D8 80218148 8E140000 */ lw $s4, ($s0) -/* 5CE7DC 8021814C 26100004 */ addiu $s0, $s0, 4 -/* 5CE7E0 80218150 0C0B1EAF */ jal get_variable -/* 5CE7E4 80218154 0280282D */ daddu $a1, $s4, $zero -/* 5CE7E8 80218158 0040982D */ daddu $s3, $v0, $zero -/* 5CE7EC 8021815C 8E150000 */ lw $s5, ($s0) -/* 5CE7F0 80218160 26100004 */ addiu $s0, $s0, 4 -/* 5CE7F4 80218164 8E050000 */ lw $a1, ($s0) -/* 5CE7F8 80218168 26100004 */ addiu $s0, $s0, 4 -/* 5CE7FC 8021816C 0C0B210B */ jal get_float_variable -/* 5CE800 80218170 0240202D */ daddu $a0, $s2, $zero -/* 5CE804 80218174 8E050000 */ lw $a1, ($s0) -/* 5CE808 80218178 26100004 */ addiu $s0, $s0, 4 -/* 5CE80C 8021817C 0240202D */ daddu $a0, $s2, $zero -/* 5CE810 80218180 0C0B210B */ jal get_float_variable -/* 5CE814 80218184 46000606 */ mov.s $f24, $f0 -/* 5CE818 80218188 8E050000 */ lw $a1, ($s0) -/* 5CE81C 8021818C 26100004 */ addiu $s0, $s0, 4 -/* 5CE820 80218190 0240202D */ daddu $a0, $s2, $zero -/* 5CE824 80218194 0C0B1EAF */ jal get_variable -/* 5CE828 80218198 46000506 */ mov.s $f20, $f0 -/* 5CE82C 8021819C 8E050000 */ lw $a1, ($s0) -/* 5CE830 802181A0 26100004 */ addiu $s0, $s0, 4 -/* 5CE834 802181A4 0240202D */ daddu $a0, $s2, $zero -/* 5CE838 802181A8 0C0B1EAF */ jal get_variable -/* 5CE83C 802181AC 0040882D */ daddu $s1, $v0, $zero -/* 5CE840 802181B0 0240202D */ daddu $a0, $s2, $zero -/* 5CE844 802181B4 8E050000 */ lw $a1, ($s0) -/* 5CE848 802181B8 0C0B210B */ jal get_float_variable -/* 5CE84C 802181BC 0040802D */ daddu $s0, $v0, $zero -/* 5CE850 802181C0 3C014334 */ lui $at, 0x4334 -/* 5CE854 802181C4 44811000 */ mtc1 $at, $f2 -/* 5CE858 802181C8 3C014049 */ lui $at, 0x4049 -/* 5CE85C 802181CC 34210FD8 */ ori $at, $at, 0xfd8 -/* 5CE860 802181D0 44812000 */ mtc1 $at, $f4 -/* 5CE864 802181D4 46020003 */ div.s $f0, $f0, $f2 -/* 5CE868 802181D8 46040582 */ mul.s $f22, $f0, $f4 -/* 5CE86C 802181DC 00000000 */ nop -/* 5CE870 802181E0 4618A501 */ sub.s $f20, $f20, $f24 -/* 5CE874 802181E4 3C013F00 */ lui $at, 0x3f00 -/* 5CE878 802181E8 44810000 */ mtc1 $at, $f0 -/* 5CE87C 802181EC 00000000 */ nop -/* 5CE880 802181F0 4600A502 */ mul.s $f20, $f20, $f0 -/* 5CE884 802181F4 00000000 */ nop -/* 5CE888 802181F8 12000007 */ beqz $s0, .L80218218 -/* 5CE88C 802181FC 0233102A */ slt $v0, $s1, $s3 -/* 5CE890 80218200 10400005 */ beqz $v0, .L80218218 -/* 5CE894 80218204 0240202D */ daddu $a0, $s2, $zero -/* 5CE898 80218208 0220982D */ daddu $s3, $s1, $zero -/* 5CE89C 8021820C 0280282D */ daddu $a1, $s4, $zero -/* 5CE8A0 80218210 0C0B2026 */ jal set_variable -/* 5CE8A4 80218214 0220302D */ daddu $a2, $s1, $zero -.L80218218: -/* 5CE8A8 80218218 3C014049 */ lui $at, 0x4049 -/* 5CE8AC 8021821C 34210FD8 */ ori $at, $at, 0xfd8 -/* 5CE8B0 80218220 44810000 */ mtc1 $at, $f0 -/* 5CE8B4 80218224 44936000 */ mtc1 $s3, $f12 -/* 5CE8B8 80218228 00000000 */ nop -/* 5CE8BC 8021822C 46806320 */ cvt.s.w $f12, $f12 -/* 5CE8C0 80218230 46006302 */ mul.s $f12, $f12, $f0 -/* 5CE8C4 80218234 00000000 */ nop -/* 5CE8C8 80218238 44910000 */ mtc1 $s1, $f0 -/* 5CE8CC 8021823C 00000000 */ nop -/* 5CE8D0 80218240 46800020 */ cvt.s.w $f0, $f0 -/* 5CE8D4 80218244 46006303 */ div.s $f12, $f12, $f0 -/* 5CE8D8 80218248 0C00A874 */ jal cos_rad -/* 5CE8DC 8021824C 46166300 */ add.s $f12, $f12, $f22 -/* 5CE8E0 80218250 4600A002 */ mul.s $f0, $f20, $f0 -/* 5CE8E4 80218254 00000000 */ nop -/* 5CE8E8 80218258 4614C080 */ add.s $f2, $f24, $f20 -/* 5CE8EC 8021825C 46001081 */ sub.s $f2, $f2, $f0 -/* 5CE8F0 80218260 0240202D */ daddu $a0, $s2, $zero -/* 5CE8F4 80218264 44061000 */ mfc1 $a2, $f2 -/* 5CE8F8 80218268 0C0B2190 */ jal set_float_variable -/* 5CE8FC 8021826C 02A0282D */ daddu $a1, $s5, $zero -/* 5CE900 80218270 8FBF0028 */ lw $ra, 0x28($sp) -/* 5CE904 80218274 8FB50024 */ lw $s5, 0x24($sp) -/* 5CE908 80218278 8FB40020 */ lw $s4, 0x20($sp) -/* 5CE90C 8021827C 8FB3001C */ lw $s3, 0x1c($sp) -/* 5CE910 80218280 8FB20018 */ lw $s2, 0x18($sp) -/* 5CE914 80218284 8FB10014 */ lw $s1, 0x14($sp) -/* 5CE918 80218288 8FB00010 */ lw $s0, 0x10($sp) -/* 5CE91C 8021828C D7B80040 */ ldc1 $f24, 0x40($sp) -/* 5CE920 80218290 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 5CE924 80218294 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 5CE928 80218298 24020002 */ addiu $v0, $zero, 2 -/* 5CE92C 8021829C 03E00008 */ jr $ra -/* 5CE930 802182A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218C40_5CF2D0.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218C40_5CF2D0.s deleted file mode 100644 index 20bc77cfc2..0000000000 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218C40_5CF2D0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218C40_5CF2D0 -/* 5CF2D0 80218C40 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 5CF2D4 80218C44 AFB20018 */ sw $s2, 0x18($sp) -/* 5CF2D8 80218C48 0080902D */ daddu $s2, $a0, $zero -/* 5CF2DC 80218C4C AFBF0028 */ sw $ra, 0x28($sp) -/* 5CF2E0 80218C50 AFB50024 */ sw $s5, 0x24($sp) -/* 5CF2E4 80218C54 AFB40020 */ sw $s4, 0x20($sp) -/* 5CF2E8 80218C58 AFB3001C */ sw $s3, 0x1c($sp) -/* 5CF2EC 80218C5C AFB10014 */ sw $s1, 0x14($sp) -/* 5CF2F0 80218C60 AFB00010 */ sw $s0, 0x10($sp) -/* 5CF2F4 80218C64 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 5CF2F8 80218C68 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 5CF2FC 80218C6C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 5CF300 80218C70 8E50000C */ lw $s0, 0xc($s2) -/* 5CF304 80218C74 8E140000 */ lw $s4, ($s0) -/* 5CF308 80218C78 26100004 */ addiu $s0, $s0, 4 -/* 5CF30C 80218C7C 0C0B1EAF */ jal get_variable -/* 5CF310 80218C80 0280282D */ daddu $a1, $s4, $zero -/* 5CF314 80218C84 0040982D */ daddu $s3, $v0, $zero -/* 5CF318 80218C88 8E150000 */ lw $s5, ($s0) -/* 5CF31C 80218C8C 26100004 */ addiu $s0, $s0, 4 -/* 5CF320 80218C90 8E050000 */ lw $a1, ($s0) -/* 5CF324 80218C94 26100004 */ addiu $s0, $s0, 4 -/* 5CF328 80218C98 0C0B210B */ jal get_float_variable -/* 5CF32C 80218C9C 0240202D */ daddu $a0, $s2, $zero -/* 5CF330 80218CA0 8E050000 */ lw $a1, ($s0) -/* 5CF334 80218CA4 26100004 */ addiu $s0, $s0, 4 -/* 5CF338 80218CA8 0240202D */ daddu $a0, $s2, $zero -/* 5CF33C 80218CAC 0C0B210B */ jal get_float_variable -/* 5CF340 80218CB0 46000606 */ mov.s $f24, $f0 -/* 5CF344 80218CB4 8E050000 */ lw $a1, ($s0) -/* 5CF348 80218CB8 26100004 */ addiu $s0, $s0, 4 -/* 5CF34C 80218CBC 0240202D */ daddu $a0, $s2, $zero -/* 5CF350 80218CC0 0C0B1EAF */ jal get_variable -/* 5CF354 80218CC4 46000506 */ mov.s $f20, $f0 -/* 5CF358 80218CC8 8E050000 */ lw $a1, ($s0) -/* 5CF35C 80218CCC 26100004 */ addiu $s0, $s0, 4 -/* 5CF360 80218CD0 0240202D */ daddu $a0, $s2, $zero -/* 5CF364 80218CD4 0C0B1EAF */ jal get_variable -/* 5CF368 80218CD8 0040882D */ daddu $s1, $v0, $zero -/* 5CF36C 80218CDC 0240202D */ daddu $a0, $s2, $zero -/* 5CF370 80218CE0 8E050000 */ lw $a1, ($s0) -/* 5CF374 80218CE4 0C0B210B */ jal get_float_variable -/* 5CF378 80218CE8 0040802D */ daddu $s0, $v0, $zero -/* 5CF37C 80218CEC 3C014334 */ lui $at, 0x4334 -/* 5CF380 80218CF0 44811000 */ mtc1 $at, $f2 -/* 5CF384 80218CF4 3C014049 */ lui $at, 0x4049 -/* 5CF388 80218CF8 34210FD8 */ ori $at, $at, 0xfd8 -/* 5CF38C 80218CFC 44812000 */ mtc1 $at, $f4 -/* 5CF390 80218D00 46020003 */ div.s $f0, $f0, $f2 -/* 5CF394 80218D04 46040582 */ mul.s $f22, $f0, $f4 -/* 5CF398 80218D08 00000000 */ nop -/* 5CF39C 80218D0C 4618A501 */ sub.s $f20, $f20, $f24 -/* 5CF3A0 80218D10 3C013F00 */ lui $at, 0x3f00 -/* 5CF3A4 80218D14 44810000 */ mtc1 $at, $f0 -/* 5CF3A8 80218D18 00000000 */ nop -/* 5CF3AC 80218D1C 4600A502 */ mul.s $f20, $f20, $f0 -/* 5CF3B0 80218D20 00000000 */ nop -/* 5CF3B4 80218D24 12000007 */ beqz $s0, .L80218D44 -/* 5CF3B8 80218D28 0233102A */ slt $v0, $s1, $s3 -/* 5CF3BC 80218D2C 10400005 */ beqz $v0, .L80218D44 -/* 5CF3C0 80218D30 0240202D */ daddu $a0, $s2, $zero -/* 5CF3C4 80218D34 0220982D */ daddu $s3, $s1, $zero -/* 5CF3C8 80218D38 0280282D */ daddu $a1, $s4, $zero -/* 5CF3CC 80218D3C 0C0B2026 */ jal set_variable -/* 5CF3D0 80218D40 0220302D */ daddu $a2, $s1, $zero -.L80218D44: -/* 5CF3D4 80218D44 3C014049 */ lui $at, 0x4049 -/* 5CF3D8 80218D48 34210FD8 */ ori $at, $at, 0xfd8 -/* 5CF3DC 80218D4C 44810000 */ mtc1 $at, $f0 -/* 5CF3E0 80218D50 44936000 */ mtc1 $s3, $f12 -/* 5CF3E4 80218D54 00000000 */ nop -/* 5CF3E8 80218D58 46806320 */ cvt.s.w $f12, $f12 -/* 5CF3EC 80218D5C 46006302 */ mul.s $f12, $f12, $f0 -/* 5CF3F0 80218D60 00000000 */ nop -/* 5CF3F4 80218D64 44910000 */ mtc1 $s1, $f0 -/* 5CF3F8 80218D68 00000000 */ nop -/* 5CF3FC 80218D6C 46800020 */ cvt.s.w $f0, $f0 -/* 5CF400 80218D70 46006303 */ div.s $f12, $f12, $f0 -/* 5CF404 80218D74 0C00A874 */ jal cos_rad -/* 5CF408 80218D78 46166300 */ add.s $f12, $f12, $f22 -/* 5CF40C 80218D7C 4600A002 */ mul.s $f0, $f20, $f0 -/* 5CF410 80218D80 00000000 */ nop -/* 5CF414 80218D84 4614C080 */ add.s $f2, $f24, $f20 -/* 5CF418 80218D88 46001081 */ sub.s $f2, $f2, $f0 -/* 5CF41C 80218D8C 0240202D */ daddu $a0, $s2, $zero -/* 5CF420 80218D90 44061000 */ mfc1 $a2, $f2 -/* 5CF424 80218D94 0C0B2190 */ jal set_float_variable -/* 5CF428 80218D98 02A0282D */ daddu $a1, $s5, $zero -/* 5CF42C 80218D9C 8FBF0028 */ lw $ra, 0x28($sp) -/* 5CF430 80218DA0 8FB50024 */ lw $s5, 0x24($sp) -/* 5CF434 80218DA4 8FB40020 */ lw $s4, 0x20($sp) -/* 5CF438 80218DA8 8FB3001C */ lw $s3, 0x1c($sp) -/* 5CF43C 80218DAC 8FB20018 */ lw $s2, 0x18($sp) -/* 5CF440 80218DB0 8FB10014 */ lw $s1, 0x14($sp) -/* 5CF444 80218DB4 8FB00010 */ lw $s0, 0x10($sp) -/* 5CF448 80218DB8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 5CF44C 80218DBC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 5CF450 80218DC0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 5CF454 80218DC4 24020002 */ addiu $v0, $zero, 2 -/* 5CF458 80218DC8 03E00008 */ jr $ra -/* 5CF45C 80218DCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219310_5CF9A0.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219310_5CF9A0.s deleted file mode 100644 index f7beef514f..0000000000 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219310_5CF9A0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219310_5CF9A0 -/* 5CF9A0 80219310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 5CF9A4 80219314 AFB20018 */ sw $s2, 0x18($sp) -/* 5CF9A8 80219318 0080902D */ daddu $s2, $a0, $zero -/* 5CF9AC 8021931C AFBF0028 */ sw $ra, 0x28($sp) -/* 5CF9B0 80219320 AFB50024 */ sw $s5, 0x24($sp) -/* 5CF9B4 80219324 AFB40020 */ sw $s4, 0x20($sp) -/* 5CF9B8 80219328 AFB3001C */ sw $s3, 0x1c($sp) -/* 5CF9BC 8021932C AFB10014 */ sw $s1, 0x14($sp) -/* 5CF9C0 80219330 AFB00010 */ sw $s0, 0x10($sp) -/* 5CF9C4 80219334 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 5CF9C8 80219338 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 5CF9CC 8021933C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 5CF9D0 80219340 8E50000C */ lw $s0, 0xc($s2) -/* 5CF9D4 80219344 8E140000 */ lw $s4, ($s0) -/* 5CF9D8 80219348 26100004 */ addiu $s0, $s0, 4 -/* 5CF9DC 8021934C 0C0B1EAF */ jal get_variable -/* 5CF9E0 80219350 0280282D */ daddu $a1, $s4, $zero -/* 5CF9E4 80219354 0040982D */ daddu $s3, $v0, $zero -/* 5CF9E8 80219358 8E150000 */ lw $s5, ($s0) -/* 5CF9EC 8021935C 26100004 */ addiu $s0, $s0, 4 -/* 5CF9F0 80219360 8E050000 */ lw $a1, ($s0) -/* 5CF9F4 80219364 26100004 */ addiu $s0, $s0, 4 -/* 5CF9F8 80219368 0C0B210B */ jal get_float_variable -/* 5CF9FC 8021936C 0240202D */ daddu $a0, $s2, $zero -/* 5CFA00 80219370 8E050000 */ lw $a1, ($s0) -/* 5CFA04 80219374 26100004 */ addiu $s0, $s0, 4 -/* 5CFA08 80219378 0240202D */ daddu $a0, $s2, $zero -/* 5CFA0C 8021937C 0C0B210B */ jal get_float_variable -/* 5CFA10 80219380 46000606 */ mov.s $f24, $f0 -/* 5CFA14 80219384 8E050000 */ lw $a1, ($s0) -/* 5CFA18 80219388 26100004 */ addiu $s0, $s0, 4 -/* 5CFA1C 8021938C 0240202D */ daddu $a0, $s2, $zero -/* 5CFA20 80219390 0C0B1EAF */ jal get_variable -/* 5CFA24 80219394 46000506 */ mov.s $f20, $f0 -/* 5CFA28 80219398 8E050000 */ lw $a1, ($s0) -/* 5CFA2C 8021939C 26100004 */ addiu $s0, $s0, 4 -/* 5CFA30 802193A0 0240202D */ daddu $a0, $s2, $zero -/* 5CFA34 802193A4 0C0B1EAF */ jal get_variable -/* 5CFA38 802193A8 0040882D */ daddu $s1, $v0, $zero -/* 5CFA3C 802193AC 0240202D */ daddu $a0, $s2, $zero -/* 5CFA40 802193B0 8E050000 */ lw $a1, ($s0) -/* 5CFA44 802193B4 0C0B210B */ jal get_float_variable -/* 5CFA48 802193B8 0040802D */ daddu $s0, $v0, $zero -/* 5CFA4C 802193BC 3C014334 */ lui $at, 0x4334 -/* 5CFA50 802193C0 44811000 */ mtc1 $at, $f2 -/* 5CFA54 802193C4 3C014049 */ lui $at, 0x4049 -/* 5CFA58 802193C8 34210FD8 */ ori $at, $at, 0xfd8 -/* 5CFA5C 802193CC 44812000 */ mtc1 $at, $f4 -/* 5CFA60 802193D0 46020003 */ div.s $f0, $f0, $f2 -/* 5CFA64 802193D4 46040582 */ mul.s $f22, $f0, $f4 -/* 5CFA68 802193D8 00000000 */ nop -/* 5CFA6C 802193DC 4618A501 */ sub.s $f20, $f20, $f24 -/* 5CFA70 802193E0 3C013F00 */ lui $at, 0x3f00 -/* 5CFA74 802193E4 44810000 */ mtc1 $at, $f0 -/* 5CFA78 802193E8 00000000 */ nop -/* 5CFA7C 802193EC 4600A502 */ mul.s $f20, $f20, $f0 -/* 5CFA80 802193F0 00000000 */ nop -/* 5CFA84 802193F4 12000007 */ beqz $s0, .L80219414 -/* 5CFA88 802193F8 0233102A */ slt $v0, $s1, $s3 -/* 5CFA8C 802193FC 10400005 */ beqz $v0, .L80219414 -/* 5CFA90 80219400 0240202D */ daddu $a0, $s2, $zero -/* 5CFA94 80219404 0220982D */ daddu $s3, $s1, $zero -/* 5CFA98 80219408 0280282D */ daddu $a1, $s4, $zero -/* 5CFA9C 8021940C 0C0B2026 */ jal set_variable -/* 5CFAA0 80219410 0220302D */ daddu $a2, $s1, $zero -.L80219414: -/* 5CFAA4 80219414 3C014049 */ lui $at, 0x4049 -/* 5CFAA8 80219418 34210FD8 */ ori $at, $at, 0xfd8 -/* 5CFAAC 8021941C 44810000 */ mtc1 $at, $f0 -/* 5CFAB0 80219420 44936000 */ mtc1 $s3, $f12 -/* 5CFAB4 80219424 00000000 */ nop -/* 5CFAB8 80219428 46806320 */ cvt.s.w $f12, $f12 -/* 5CFABC 8021942C 46006302 */ mul.s $f12, $f12, $f0 -/* 5CFAC0 80219430 00000000 */ nop -/* 5CFAC4 80219434 44910000 */ mtc1 $s1, $f0 -/* 5CFAC8 80219438 00000000 */ nop -/* 5CFACC 8021943C 46800020 */ cvt.s.w $f0, $f0 -/* 5CFAD0 80219440 46006303 */ div.s $f12, $f12, $f0 -/* 5CFAD4 80219444 0C00A874 */ jal cos_rad -/* 5CFAD8 80219448 46166300 */ add.s $f12, $f12, $f22 -/* 5CFADC 8021944C 4600A002 */ mul.s $f0, $f20, $f0 -/* 5CFAE0 80219450 00000000 */ nop -/* 5CFAE4 80219454 4614C080 */ add.s $f2, $f24, $f20 -/* 5CFAE8 80219458 46001081 */ sub.s $f2, $f2, $f0 -/* 5CFAEC 8021945C 0240202D */ daddu $a0, $s2, $zero -/* 5CFAF0 80219460 44061000 */ mfc1 $a2, $f2 -/* 5CFAF4 80219464 0C0B2190 */ jal set_float_variable -/* 5CFAF8 80219468 02A0282D */ daddu $a1, $s5, $zero -/* 5CFAFC 8021946C 8FBF0028 */ lw $ra, 0x28($sp) -/* 5CFB00 80219470 8FB50024 */ lw $s5, 0x24($sp) -/* 5CFB04 80219474 8FB40020 */ lw $s4, 0x20($sp) -/* 5CFB08 80219478 8FB3001C */ lw $s3, 0x1c($sp) -/* 5CFB0C 8021947C 8FB20018 */ lw $s2, 0x18($sp) -/* 5CFB10 80219480 8FB10014 */ lw $s1, 0x14($sp) -/* 5CFB14 80219484 8FB00010 */ lw $s0, 0x10($sp) -/* 5CFB18 80219488 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 5CFB1C 8021948C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 5CFB20 80219490 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 5CFB24 80219494 24020002 */ addiu $v0, $zero, 2 -/* 5CFB28 80219498 03E00008 */ jr $ra -/* 5CFB2C 8021949C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802194A0_5CFB30.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802194A0_5CFB30.s deleted file mode 100644 index 5d8cd347dc..0000000000 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802194A0_5CFB30.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802194A0_5CFB30 -/* 5CFB30 802194A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 5CFB34 802194A4 AFB20018 */ sw $s2, 0x18($sp) -/* 5CFB38 802194A8 0080902D */ daddu $s2, $a0, $zero -/* 5CFB3C 802194AC AFBF0028 */ sw $ra, 0x28($sp) -/* 5CFB40 802194B0 AFB50024 */ sw $s5, 0x24($sp) -/* 5CFB44 802194B4 AFB40020 */ sw $s4, 0x20($sp) -/* 5CFB48 802194B8 AFB3001C */ sw $s3, 0x1c($sp) -/* 5CFB4C 802194BC AFB10014 */ sw $s1, 0x14($sp) -/* 5CFB50 802194C0 AFB00010 */ sw $s0, 0x10($sp) -/* 5CFB54 802194C4 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 5CFB58 802194C8 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 5CFB5C 802194CC F7B40030 */ sdc1 $f20, 0x30($sp) -/* 5CFB60 802194D0 8E50000C */ lw $s0, 0xc($s2) -/* 5CFB64 802194D4 8E140000 */ lw $s4, ($s0) -/* 5CFB68 802194D8 26100004 */ addiu $s0, $s0, 4 -/* 5CFB6C 802194DC 0C0B1EAF */ jal get_variable -/* 5CFB70 802194E0 0280282D */ daddu $a1, $s4, $zero -/* 5CFB74 802194E4 0040982D */ daddu $s3, $v0, $zero -/* 5CFB78 802194E8 8E150000 */ lw $s5, ($s0) -/* 5CFB7C 802194EC 26100004 */ addiu $s0, $s0, 4 -/* 5CFB80 802194F0 8E050000 */ lw $a1, ($s0) -/* 5CFB84 802194F4 26100004 */ addiu $s0, $s0, 4 -/* 5CFB88 802194F8 0C0B210B */ jal get_float_variable -/* 5CFB8C 802194FC 0240202D */ daddu $a0, $s2, $zero -/* 5CFB90 80219500 8E050000 */ lw $a1, ($s0) -/* 5CFB94 80219504 26100004 */ addiu $s0, $s0, 4 -/* 5CFB98 80219508 0240202D */ daddu $a0, $s2, $zero -/* 5CFB9C 8021950C 0C0B210B */ jal get_float_variable -/* 5CFBA0 80219510 46000606 */ mov.s $f24, $f0 -/* 5CFBA4 80219514 8E050000 */ lw $a1, ($s0) -/* 5CFBA8 80219518 26100004 */ addiu $s0, $s0, 4 -/* 5CFBAC 8021951C 0240202D */ daddu $a0, $s2, $zero -/* 5CFBB0 80219520 0C0B1EAF */ jal get_variable -/* 5CFBB4 80219524 46000506 */ mov.s $f20, $f0 -/* 5CFBB8 80219528 8E050000 */ lw $a1, ($s0) -/* 5CFBBC 8021952C 26100004 */ addiu $s0, $s0, 4 -/* 5CFBC0 80219530 0240202D */ daddu $a0, $s2, $zero -/* 5CFBC4 80219534 0C0B1EAF */ jal get_variable -/* 5CFBC8 80219538 0040882D */ daddu $s1, $v0, $zero -/* 5CFBCC 8021953C 0240202D */ daddu $a0, $s2, $zero -/* 5CFBD0 80219540 8E050000 */ lw $a1, ($s0) -/* 5CFBD4 80219544 0C0B210B */ jal get_float_variable -/* 5CFBD8 80219548 0040802D */ daddu $s0, $v0, $zero -/* 5CFBDC 8021954C 3C014334 */ lui $at, 0x4334 -/* 5CFBE0 80219550 44811000 */ mtc1 $at, $f2 -/* 5CFBE4 80219554 3C014049 */ lui $at, 0x4049 -/* 5CFBE8 80219558 34210FD8 */ ori $at, $at, 0xfd8 -/* 5CFBEC 8021955C 44812000 */ mtc1 $at, $f4 -/* 5CFBF0 80219560 46020003 */ div.s $f0, $f0, $f2 -/* 5CFBF4 80219564 46040582 */ mul.s $f22, $f0, $f4 -/* 5CFBF8 80219568 00000000 */ nop -/* 5CFBFC 8021956C 4618A501 */ sub.s $f20, $f20, $f24 -/* 5CFC00 80219570 3C013F00 */ lui $at, 0x3f00 -/* 5CFC04 80219574 44810000 */ mtc1 $at, $f0 -/* 5CFC08 80219578 00000000 */ nop -/* 5CFC0C 8021957C 4600A502 */ mul.s $f20, $f20, $f0 -/* 5CFC10 80219580 00000000 */ nop -/* 5CFC14 80219584 12000007 */ beqz $s0, .L802195A4 -/* 5CFC18 80219588 0233102A */ slt $v0, $s1, $s3 -/* 5CFC1C 8021958C 10400005 */ beqz $v0, .L802195A4 -/* 5CFC20 80219590 0240202D */ daddu $a0, $s2, $zero -/* 5CFC24 80219594 0220982D */ daddu $s3, $s1, $zero -/* 5CFC28 80219598 0280282D */ daddu $a1, $s4, $zero -/* 5CFC2C 8021959C 0C0B2026 */ jal set_variable -/* 5CFC30 802195A0 0220302D */ daddu $a2, $s1, $zero -.L802195A4: -/* 5CFC34 802195A4 3C014049 */ lui $at, 0x4049 -/* 5CFC38 802195A8 34210FD8 */ ori $at, $at, 0xfd8 -/* 5CFC3C 802195AC 44810000 */ mtc1 $at, $f0 -/* 5CFC40 802195B0 44936000 */ mtc1 $s3, $f12 -/* 5CFC44 802195B4 00000000 */ nop -/* 5CFC48 802195B8 46806320 */ cvt.s.w $f12, $f12 -/* 5CFC4C 802195BC 46006302 */ mul.s $f12, $f12, $f0 -/* 5CFC50 802195C0 00000000 */ nop -/* 5CFC54 802195C4 44910000 */ mtc1 $s1, $f0 -/* 5CFC58 802195C8 00000000 */ nop -/* 5CFC5C 802195CC 46800020 */ cvt.s.w $f0, $f0 -/* 5CFC60 802195D0 46006303 */ div.s $f12, $f12, $f0 -/* 5CFC64 802195D4 0C00A874 */ jal cos_rad -/* 5CFC68 802195D8 46166300 */ add.s $f12, $f12, $f22 -/* 5CFC6C 802195DC 4600A002 */ mul.s $f0, $f20, $f0 -/* 5CFC70 802195E0 00000000 */ nop -/* 5CFC74 802195E4 4614C080 */ add.s $f2, $f24, $f20 -/* 5CFC78 802195E8 46001081 */ sub.s $f2, $f2, $f0 -/* 5CFC7C 802195EC 0240202D */ daddu $a0, $s2, $zero -/* 5CFC80 802195F0 44061000 */ mfc1 $a2, $f2 -/* 5CFC84 802195F4 0C0B2190 */ jal set_float_variable -/* 5CFC88 802195F8 02A0282D */ daddu $a1, $s5, $zero -/* 5CFC8C 802195FC 8FBF0028 */ lw $ra, 0x28($sp) -/* 5CFC90 80219600 8FB50024 */ lw $s5, 0x24($sp) -/* 5CFC94 80219604 8FB40020 */ lw $s4, 0x20($sp) -/* 5CFC98 80219608 8FB3001C */ lw $s3, 0x1c($sp) -/* 5CFC9C 8021960C 8FB20018 */ lw $s2, 0x18($sp) -/* 5CFCA0 80219610 8FB10014 */ lw $s1, 0x14($sp) -/* 5CFCA4 80219614 8FB00010 */ lw $s0, 0x10($sp) -/* 5CFCA8 80219618 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 5CFCAC 8021961C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 5CFCB0 80219620 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 5CFCB4 80219624 24020002 */ addiu $v0, $zero, 2 -/* 5CFCB8 80219628 03E00008 */ jr $ra -/* 5CFCBC 8021962C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_kpa/684C30/func_80218358_684D88.s b/asm/nonmatchings/battle/area_kpa/684C30/func_80218358_684D88.s deleted file mode 100644 index 8ae5a5a1c3..0000000000 --- a/asm/nonmatchings/battle/area_kpa/684C30/func_80218358_684D88.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218358_684D88 -/* 684D88 80218358 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 684D8C 8021835C AFB20018 */ sw $s2, 0x18($sp) -/* 684D90 80218360 0080902D */ daddu $s2, $a0, $zero -/* 684D94 80218364 AFBF0028 */ sw $ra, 0x28($sp) -/* 684D98 80218368 AFB50024 */ sw $s5, 0x24($sp) -/* 684D9C 8021836C AFB40020 */ sw $s4, 0x20($sp) -/* 684DA0 80218370 AFB3001C */ sw $s3, 0x1c($sp) -/* 684DA4 80218374 AFB10014 */ sw $s1, 0x14($sp) -/* 684DA8 80218378 AFB00010 */ sw $s0, 0x10($sp) -/* 684DAC 8021837C F7B80040 */ sdc1 $f24, 0x40($sp) -/* 684DB0 80218380 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 684DB4 80218384 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 684DB8 80218388 8E50000C */ lw $s0, 0xc($s2) -/* 684DBC 8021838C 8E140000 */ lw $s4, ($s0) -/* 684DC0 80218390 26100004 */ addiu $s0, $s0, 4 -/* 684DC4 80218394 0C0B1EAF */ jal get_variable -/* 684DC8 80218398 0280282D */ daddu $a1, $s4, $zero -/* 684DCC 8021839C 0040982D */ daddu $s3, $v0, $zero -/* 684DD0 802183A0 8E150000 */ lw $s5, ($s0) -/* 684DD4 802183A4 26100004 */ addiu $s0, $s0, 4 -/* 684DD8 802183A8 8E050000 */ lw $a1, ($s0) -/* 684DDC 802183AC 26100004 */ addiu $s0, $s0, 4 -/* 684DE0 802183B0 0C0B210B */ jal get_float_variable -/* 684DE4 802183B4 0240202D */ daddu $a0, $s2, $zero -/* 684DE8 802183B8 8E050000 */ lw $a1, ($s0) -/* 684DEC 802183BC 26100004 */ addiu $s0, $s0, 4 -/* 684DF0 802183C0 0240202D */ daddu $a0, $s2, $zero -/* 684DF4 802183C4 0C0B210B */ jal get_float_variable -/* 684DF8 802183C8 46000606 */ mov.s $f24, $f0 -/* 684DFC 802183CC 8E050000 */ lw $a1, ($s0) -/* 684E00 802183D0 26100004 */ addiu $s0, $s0, 4 -/* 684E04 802183D4 0240202D */ daddu $a0, $s2, $zero -/* 684E08 802183D8 0C0B1EAF */ jal get_variable -/* 684E0C 802183DC 46000506 */ mov.s $f20, $f0 -/* 684E10 802183E0 8E050000 */ lw $a1, ($s0) -/* 684E14 802183E4 26100004 */ addiu $s0, $s0, 4 -/* 684E18 802183E8 0240202D */ daddu $a0, $s2, $zero -/* 684E1C 802183EC 0C0B1EAF */ jal get_variable -/* 684E20 802183F0 0040882D */ daddu $s1, $v0, $zero -/* 684E24 802183F4 0240202D */ daddu $a0, $s2, $zero -/* 684E28 802183F8 8E050000 */ lw $a1, ($s0) -/* 684E2C 802183FC 0C0B210B */ jal get_float_variable -/* 684E30 80218400 0040802D */ daddu $s0, $v0, $zero -/* 684E34 80218404 3C014334 */ lui $at, 0x4334 -/* 684E38 80218408 44811000 */ mtc1 $at, $f2 -/* 684E3C 8021840C 3C014049 */ lui $at, 0x4049 -/* 684E40 80218410 34210FD8 */ ori $at, $at, 0xfd8 -/* 684E44 80218414 44812000 */ mtc1 $at, $f4 -/* 684E48 80218418 46020003 */ div.s $f0, $f0, $f2 -/* 684E4C 8021841C 46040582 */ mul.s $f22, $f0, $f4 -/* 684E50 80218420 00000000 */ nop -/* 684E54 80218424 4618A501 */ sub.s $f20, $f20, $f24 -/* 684E58 80218428 3C013F00 */ lui $at, 0x3f00 -/* 684E5C 8021842C 44810000 */ mtc1 $at, $f0 -/* 684E60 80218430 00000000 */ nop -/* 684E64 80218434 4600A502 */ mul.s $f20, $f20, $f0 -/* 684E68 80218438 00000000 */ nop -/* 684E6C 8021843C 12000007 */ beqz $s0, .L8021845C -/* 684E70 80218440 0233102A */ slt $v0, $s1, $s3 -/* 684E74 80218444 10400005 */ beqz $v0, .L8021845C -/* 684E78 80218448 0240202D */ daddu $a0, $s2, $zero -/* 684E7C 8021844C 0220982D */ daddu $s3, $s1, $zero -/* 684E80 80218450 0280282D */ daddu $a1, $s4, $zero -/* 684E84 80218454 0C0B2026 */ jal set_variable -/* 684E88 80218458 0220302D */ daddu $a2, $s1, $zero -.L8021845C: -/* 684E8C 8021845C 3C014049 */ lui $at, 0x4049 -/* 684E90 80218460 34210FD8 */ ori $at, $at, 0xfd8 -/* 684E94 80218464 44810000 */ mtc1 $at, $f0 -/* 684E98 80218468 44936000 */ mtc1 $s3, $f12 -/* 684E9C 8021846C 00000000 */ nop -/* 684EA0 80218470 46806320 */ cvt.s.w $f12, $f12 -/* 684EA4 80218474 46006302 */ mul.s $f12, $f12, $f0 -/* 684EA8 80218478 00000000 */ nop -/* 684EAC 8021847C 44910000 */ mtc1 $s1, $f0 -/* 684EB0 80218480 00000000 */ nop -/* 684EB4 80218484 46800020 */ cvt.s.w $f0, $f0 -/* 684EB8 80218488 46006303 */ div.s $f12, $f12, $f0 -/* 684EBC 8021848C 0C00A874 */ jal cos_rad -/* 684EC0 80218490 46166300 */ add.s $f12, $f12, $f22 -/* 684EC4 80218494 4600A002 */ mul.s $f0, $f20, $f0 -/* 684EC8 80218498 00000000 */ nop -/* 684ECC 8021849C 4614C080 */ add.s $f2, $f24, $f20 -/* 684ED0 802184A0 46001081 */ sub.s $f2, $f2, $f0 -/* 684ED4 802184A4 0240202D */ daddu $a0, $s2, $zero -/* 684ED8 802184A8 44061000 */ mfc1 $a2, $f2 -/* 684EDC 802184AC 0C0B2190 */ jal set_float_variable -/* 684EE0 802184B0 02A0282D */ daddu $a1, $s5, $zero -/* 684EE4 802184B4 8FBF0028 */ lw $ra, 0x28($sp) -/* 684EE8 802184B8 8FB50024 */ lw $s5, 0x24($sp) -/* 684EEC 802184BC 8FB40020 */ lw $s4, 0x20($sp) -/* 684EF0 802184C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 684EF4 802184C4 8FB20018 */ lw $s2, 0x18($sp) -/* 684EF8 802184C8 8FB10014 */ lw $s1, 0x14($sp) -/* 684EFC 802184CC 8FB00010 */ lw $s0, 0x10($sp) -/* 684F00 802184D0 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 684F04 802184D4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 684F08 802184D8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 684F0C 802184DC 24020002 */ addiu $v0, $zero, 2 -/* 684F10 802184E0 03E00008 */ jr $ra -/* 684F14 802184E4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_802182A8_6CC318.s b/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_802182A8_6CC318.s deleted file mode 100644 index 14f1e58060..0000000000 --- a/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_802182A8_6CC318.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802182A8_6CC318 -/* 6CC318 802182A8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 6CC31C 802182AC AFB20018 */ sw $s2, 0x18($sp) -/* 6CC320 802182B0 0080902D */ daddu $s2, $a0, $zero -/* 6CC324 802182B4 AFBF0028 */ sw $ra, 0x28($sp) -/* 6CC328 802182B8 AFB50024 */ sw $s5, 0x24($sp) -/* 6CC32C 802182BC AFB40020 */ sw $s4, 0x20($sp) -/* 6CC330 802182C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 6CC334 802182C4 AFB10014 */ sw $s1, 0x14($sp) -/* 6CC338 802182C8 AFB00010 */ sw $s0, 0x10($sp) -/* 6CC33C 802182CC F7B80040 */ sdc1 $f24, 0x40($sp) -/* 6CC340 802182D0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 6CC344 802182D4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 6CC348 802182D8 8E50000C */ lw $s0, 0xc($s2) -/* 6CC34C 802182DC 8E140000 */ lw $s4, ($s0) -/* 6CC350 802182E0 26100004 */ addiu $s0, $s0, 4 -/* 6CC354 802182E4 0C0B1EAF */ jal get_variable -/* 6CC358 802182E8 0280282D */ daddu $a1, $s4, $zero -/* 6CC35C 802182EC 0040982D */ daddu $s3, $v0, $zero -/* 6CC360 802182F0 8E150000 */ lw $s5, ($s0) -/* 6CC364 802182F4 26100004 */ addiu $s0, $s0, 4 -/* 6CC368 802182F8 8E050000 */ lw $a1, ($s0) -/* 6CC36C 802182FC 26100004 */ addiu $s0, $s0, 4 -/* 6CC370 80218300 0C0B210B */ jal get_float_variable -/* 6CC374 80218304 0240202D */ daddu $a0, $s2, $zero -/* 6CC378 80218308 8E050000 */ lw $a1, ($s0) -/* 6CC37C 8021830C 26100004 */ addiu $s0, $s0, 4 -/* 6CC380 80218310 0240202D */ daddu $a0, $s2, $zero -/* 6CC384 80218314 0C0B210B */ jal get_float_variable -/* 6CC388 80218318 46000606 */ mov.s $f24, $f0 -/* 6CC38C 8021831C 8E050000 */ lw $a1, ($s0) -/* 6CC390 80218320 26100004 */ addiu $s0, $s0, 4 -/* 6CC394 80218324 0240202D */ daddu $a0, $s2, $zero -/* 6CC398 80218328 0C0B1EAF */ jal get_variable -/* 6CC39C 8021832C 46000506 */ mov.s $f20, $f0 -/* 6CC3A0 80218330 8E050000 */ lw $a1, ($s0) -/* 6CC3A4 80218334 26100004 */ addiu $s0, $s0, 4 -/* 6CC3A8 80218338 0240202D */ daddu $a0, $s2, $zero -/* 6CC3AC 8021833C 0C0B1EAF */ jal get_variable -/* 6CC3B0 80218340 0040882D */ daddu $s1, $v0, $zero -/* 6CC3B4 80218344 0240202D */ daddu $a0, $s2, $zero -/* 6CC3B8 80218348 8E050000 */ lw $a1, ($s0) -/* 6CC3BC 8021834C 0C0B210B */ jal get_float_variable -/* 6CC3C0 80218350 0040802D */ daddu $s0, $v0, $zero -/* 6CC3C4 80218354 3C014334 */ lui $at, 0x4334 -/* 6CC3C8 80218358 44811000 */ mtc1 $at, $f2 -/* 6CC3CC 8021835C 3C014049 */ lui $at, 0x4049 -/* 6CC3D0 80218360 34210FD8 */ ori $at, $at, 0xfd8 -/* 6CC3D4 80218364 44812000 */ mtc1 $at, $f4 -/* 6CC3D8 80218368 46020003 */ div.s $f0, $f0, $f2 -/* 6CC3DC 8021836C 46040582 */ mul.s $f22, $f0, $f4 -/* 6CC3E0 80218370 00000000 */ nop -/* 6CC3E4 80218374 4618A501 */ sub.s $f20, $f20, $f24 -/* 6CC3E8 80218378 3C013F00 */ lui $at, 0x3f00 -/* 6CC3EC 8021837C 44810000 */ mtc1 $at, $f0 -/* 6CC3F0 80218380 00000000 */ nop -/* 6CC3F4 80218384 4600A502 */ mul.s $f20, $f20, $f0 -/* 6CC3F8 80218388 00000000 */ nop -/* 6CC3FC 8021838C 12000007 */ beqz $s0, .L802183AC -/* 6CC400 80218390 0233102A */ slt $v0, $s1, $s3 -/* 6CC404 80218394 10400005 */ beqz $v0, .L802183AC -/* 6CC408 80218398 0240202D */ daddu $a0, $s2, $zero -/* 6CC40C 8021839C 0220982D */ daddu $s3, $s1, $zero -/* 6CC410 802183A0 0280282D */ daddu $a1, $s4, $zero -/* 6CC414 802183A4 0C0B2026 */ jal set_variable -/* 6CC418 802183A8 0220302D */ daddu $a2, $s1, $zero -.L802183AC: -/* 6CC41C 802183AC 3C014049 */ lui $at, 0x4049 -/* 6CC420 802183B0 34210FD8 */ ori $at, $at, 0xfd8 -/* 6CC424 802183B4 44810000 */ mtc1 $at, $f0 -/* 6CC428 802183B8 44936000 */ mtc1 $s3, $f12 -/* 6CC42C 802183BC 00000000 */ nop -/* 6CC430 802183C0 46806320 */ cvt.s.w $f12, $f12 -/* 6CC434 802183C4 46006302 */ mul.s $f12, $f12, $f0 -/* 6CC438 802183C8 00000000 */ nop -/* 6CC43C 802183CC 44910000 */ mtc1 $s1, $f0 -/* 6CC440 802183D0 00000000 */ nop -/* 6CC444 802183D4 46800020 */ cvt.s.w $f0, $f0 -/* 6CC448 802183D8 46006303 */ div.s $f12, $f12, $f0 -/* 6CC44C 802183DC 0C00A874 */ jal cos_rad -/* 6CC450 802183E0 46166300 */ add.s $f12, $f12, $f22 -/* 6CC454 802183E4 4600A002 */ mul.s $f0, $f20, $f0 -/* 6CC458 802183E8 00000000 */ nop -/* 6CC45C 802183EC 4614C080 */ add.s $f2, $f24, $f20 -/* 6CC460 802183F0 46001081 */ sub.s $f2, $f2, $f0 -/* 6CC464 802183F4 0240202D */ daddu $a0, $s2, $zero -/* 6CC468 802183F8 44061000 */ mfc1 $a2, $f2 -/* 6CC46C 802183FC 0C0B2190 */ jal set_float_variable -/* 6CC470 80218400 02A0282D */ daddu $a1, $s5, $zero -/* 6CC474 80218404 8FBF0028 */ lw $ra, 0x28($sp) -/* 6CC478 80218408 8FB50024 */ lw $s5, 0x24($sp) -/* 6CC47C 8021840C 8FB40020 */ lw $s4, 0x20($sp) -/* 6CC480 80218410 8FB3001C */ lw $s3, 0x1c($sp) -/* 6CC484 80218414 8FB20018 */ lw $s2, 0x18($sp) -/* 6CC488 80218418 8FB10014 */ lw $s1, 0x14($sp) -/* 6CC48C 8021841C 8FB00010 */ lw $s0, 0x10($sp) -/* 6CC490 80218420 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 6CC494 80218424 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 6CC498 80218428 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 6CC49C 8021842C 24020002 */ addiu $v0, $zero, 2 -/* 6CC4A0 80218430 03E00008 */ jr $ra -/* 6CC4A4 80218434 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_80218058_6607A8.s b/asm/nonmatchings/battle/area_pra2/660750/func_80218058_6607A8.s deleted file mode 100644 index 2d0f429528..0000000000 --- a/asm/nonmatchings/battle/area_pra2/660750/func_80218058_6607A8.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218058_6607A8 -/* 6607A8 80218058 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 6607AC 8021805C AFB20018 */ sw $s2, 0x18($sp) -/* 6607B0 80218060 0080902D */ daddu $s2, $a0, $zero -/* 6607B4 80218064 AFBF0028 */ sw $ra, 0x28($sp) -/* 6607B8 80218068 AFB50024 */ sw $s5, 0x24($sp) -/* 6607BC 8021806C AFB40020 */ sw $s4, 0x20($sp) -/* 6607C0 80218070 AFB3001C */ sw $s3, 0x1c($sp) -/* 6607C4 80218074 AFB10014 */ sw $s1, 0x14($sp) -/* 6607C8 80218078 AFB00010 */ sw $s0, 0x10($sp) -/* 6607CC 8021807C F7B80040 */ sdc1 $f24, 0x40($sp) -/* 6607D0 80218080 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 6607D4 80218084 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 6607D8 80218088 8E50000C */ lw $s0, 0xc($s2) -/* 6607DC 8021808C 8E140000 */ lw $s4, ($s0) -/* 6607E0 80218090 26100004 */ addiu $s0, $s0, 4 -/* 6607E4 80218094 0C0B1EAF */ jal get_variable -/* 6607E8 80218098 0280282D */ daddu $a1, $s4, $zero -/* 6607EC 8021809C 0040982D */ daddu $s3, $v0, $zero -/* 6607F0 802180A0 8E150000 */ lw $s5, ($s0) -/* 6607F4 802180A4 26100004 */ addiu $s0, $s0, 4 -/* 6607F8 802180A8 8E050000 */ lw $a1, ($s0) -/* 6607FC 802180AC 26100004 */ addiu $s0, $s0, 4 -/* 660800 802180B0 0C0B210B */ jal get_float_variable -/* 660804 802180B4 0240202D */ daddu $a0, $s2, $zero -/* 660808 802180B8 8E050000 */ lw $a1, ($s0) -/* 66080C 802180BC 26100004 */ addiu $s0, $s0, 4 -/* 660810 802180C0 0240202D */ daddu $a0, $s2, $zero -/* 660814 802180C4 0C0B210B */ jal get_float_variable -/* 660818 802180C8 46000606 */ mov.s $f24, $f0 -/* 66081C 802180CC 8E050000 */ lw $a1, ($s0) -/* 660820 802180D0 26100004 */ addiu $s0, $s0, 4 -/* 660824 802180D4 0240202D */ daddu $a0, $s2, $zero -/* 660828 802180D8 0C0B1EAF */ jal get_variable -/* 66082C 802180DC 46000506 */ mov.s $f20, $f0 -/* 660830 802180E0 8E050000 */ lw $a1, ($s0) -/* 660834 802180E4 26100004 */ addiu $s0, $s0, 4 -/* 660838 802180E8 0240202D */ daddu $a0, $s2, $zero -/* 66083C 802180EC 0C0B1EAF */ jal get_variable -/* 660840 802180F0 0040882D */ daddu $s1, $v0, $zero -/* 660844 802180F4 0240202D */ daddu $a0, $s2, $zero -/* 660848 802180F8 8E050000 */ lw $a1, ($s0) -/* 66084C 802180FC 0C0B210B */ jal get_float_variable -/* 660850 80218100 0040802D */ daddu $s0, $v0, $zero -/* 660854 80218104 3C014334 */ lui $at, 0x4334 -/* 660858 80218108 44811000 */ mtc1 $at, $f2 -/* 66085C 8021810C 3C014049 */ lui $at, 0x4049 -/* 660860 80218110 34210FD8 */ ori $at, $at, 0xfd8 -/* 660864 80218114 44812000 */ mtc1 $at, $f4 -/* 660868 80218118 46020003 */ div.s $f0, $f0, $f2 -/* 66086C 8021811C 46040582 */ mul.s $f22, $f0, $f4 -/* 660870 80218120 00000000 */ nop -/* 660874 80218124 4618A501 */ sub.s $f20, $f20, $f24 -/* 660878 80218128 3C013F00 */ lui $at, 0x3f00 -/* 66087C 8021812C 44810000 */ mtc1 $at, $f0 -/* 660880 80218130 00000000 */ nop -/* 660884 80218134 4600A502 */ mul.s $f20, $f20, $f0 -/* 660888 80218138 00000000 */ nop -/* 66088C 8021813C 12000007 */ beqz $s0, .L8021815C -/* 660890 80218140 0233102A */ slt $v0, $s1, $s3 -/* 660894 80218144 10400005 */ beqz $v0, .L8021815C -/* 660898 80218148 0240202D */ daddu $a0, $s2, $zero -/* 66089C 8021814C 0220982D */ daddu $s3, $s1, $zero -/* 6608A0 80218150 0280282D */ daddu $a1, $s4, $zero -/* 6608A4 80218154 0C0B2026 */ jal set_variable -/* 6608A8 80218158 0220302D */ daddu $a2, $s1, $zero -.L8021815C: -/* 6608AC 8021815C 3C014049 */ lui $at, 0x4049 -/* 6608B0 80218160 34210FD8 */ ori $at, $at, 0xfd8 -/* 6608B4 80218164 44810000 */ mtc1 $at, $f0 -/* 6608B8 80218168 44936000 */ mtc1 $s3, $f12 -/* 6608BC 8021816C 00000000 */ nop -/* 6608C0 80218170 46806320 */ cvt.s.w $f12, $f12 -/* 6608C4 80218174 46006302 */ mul.s $f12, $f12, $f0 -/* 6608C8 80218178 00000000 */ nop -/* 6608CC 8021817C 44910000 */ mtc1 $s1, $f0 -/* 6608D0 80218180 00000000 */ nop -/* 6608D4 80218184 46800020 */ cvt.s.w $f0, $f0 -/* 6608D8 80218188 46006303 */ div.s $f12, $f12, $f0 -/* 6608DC 8021818C 0C00A874 */ jal cos_rad -/* 6608E0 80218190 46166300 */ add.s $f12, $f12, $f22 -/* 6608E4 80218194 4600A002 */ mul.s $f0, $f20, $f0 -/* 6608E8 80218198 00000000 */ nop -/* 6608EC 8021819C 4614C080 */ add.s $f2, $f24, $f20 -/* 6608F0 802181A0 46001081 */ sub.s $f2, $f2, $f0 -/* 6608F4 802181A4 0240202D */ daddu $a0, $s2, $zero -/* 6608F8 802181A8 44061000 */ mfc1 $a2, $f2 -/* 6608FC 802181AC 0C0B2190 */ jal set_float_variable -/* 660900 802181B0 02A0282D */ daddu $a1, $s5, $zero -/* 660904 802181B4 8FBF0028 */ lw $ra, 0x28($sp) -/* 660908 802181B8 8FB50024 */ lw $s5, 0x24($sp) -/* 66090C 802181BC 8FB40020 */ lw $s4, 0x20($sp) -/* 660910 802181C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 660914 802181C4 8FB20018 */ lw $s2, 0x18($sp) -/* 660918 802181C8 8FB10014 */ lw $s1, 0x14($sp) -/* 66091C 802181CC 8FB00010 */ lw $s0, 0x10($sp) -/* 660920 802181D0 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 660924 802181D4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 660928 802181D8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 66092C 802181DC 24020002 */ addiu $v0, $zero, 2 -/* 660930 802181E0 03E00008 */ jr $ra -/* 660934 802181E4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802411EC_C9F10C.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802411EC_C9F10C.s deleted file mode 100644 index 59e27a8f08..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802411EC_C9F10C.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411EC_C9F10C -/* C9F10C 802411EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C9F110 802411F0 AFB20018 */ sw $s2, 0x18($sp) -/* C9F114 802411F4 0080902D */ daddu $s2, $a0, $zero -/* C9F118 802411F8 AFBF0028 */ sw $ra, 0x28($sp) -/* C9F11C 802411FC AFB50024 */ sw $s5, 0x24($sp) -/* C9F120 80241200 AFB40020 */ sw $s4, 0x20($sp) -/* C9F124 80241204 AFB3001C */ sw $s3, 0x1c($sp) -/* C9F128 80241208 AFB10014 */ sw $s1, 0x14($sp) -/* C9F12C 8024120C AFB00010 */ sw $s0, 0x10($sp) -/* C9F130 80241210 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C9F134 80241214 F7B60038 */ sdc1 $f22, 0x38($sp) -/* C9F138 80241218 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C9F13C 8024121C 8E50000C */ lw $s0, 0xc($s2) -/* C9F140 80241220 8E140000 */ lw $s4, ($s0) -/* C9F144 80241224 26100004 */ addiu $s0, $s0, 4 -/* C9F148 80241228 0C0B1EAF */ jal get_variable -/* C9F14C 8024122C 0280282D */ daddu $a1, $s4, $zero -/* C9F150 80241230 0040982D */ daddu $s3, $v0, $zero -/* C9F154 80241234 8E150000 */ lw $s5, ($s0) -/* C9F158 80241238 26100004 */ addiu $s0, $s0, 4 -/* C9F15C 8024123C 8E050000 */ lw $a1, ($s0) -/* C9F160 80241240 26100004 */ addiu $s0, $s0, 4 -/* C9F164 80241244 0C0B210B */ jal get_float_variable -/* C9F168 80241248 0240202D */ daddu $a0, $s2, $zero -/* C9F16C 8024124C 8E050000 */ lw $a1, ($s0) -/* C9F170 80241250 26100004 */ addiu $s0, $s0, 4 -/* C9F174 80241254 0240202D */ daddu $a0, $s2, $zero -/* C9F178 80241258 0C0B210B */ jal get_float_variable -/* C9F17C 8024125C 46000606 */ mov.s $f24, $f0 -/* C9F180 80241260 8E050000 */ lw $a1, ($s0) -/* C9F184 80241264 26100004 */ addiu $s0, $s0, 4 -/* C9F188 80241268 0240202D */ daddu $a0, $s2, $zero -/* C9F18C 8024126C 0C0B1EAF */ jal get_variable -/* C9F190 80241270 46000506 */ mov.s $f20, $f0 -/* C9F194 80241274 8E050000 */ lw $a1, ($s0) -/* C9F198 80241278 26100004 */ addiu $s0, $s0, 4 -/* C9F19C 8024127C 0240202D */ daddu $a0, $s2, $zero -/* C9F1A0 80241280 0C0B1EAF */ jal get_variable -/* C9F1A4 80241284 0040882D */ daddu $s1, $v0, $zero -/* C9F1A8 80241288 0240202D */ daddu $a0, $s2, $zero -/* C9F1AC 8024128C 8E050000 */ lw $a1, ($s0) -/* C9F1B0 80241290 0C0B210B */ jal get_float_variable -/* C9F1B4 80241294 0040802D */ daddu $s0, $v0, $zero -/* C9F1B8 80241298 3C014334 */ lui $at, 0x4334 -/* C9F1BC 8024129C 44811000 */ mtc1 $at, $f2 -/* C9F1C0 802412A0 3C014049 */ lui $at, 0x4049 -/* C9F1C4 802412A4 34210FD8 */ ori $at, $at, 0xfd8 -/* C9F1C8 802412A8 44812000 */ mtc1 $at, $f4 -/* C9F1CC 802412AC 46020003 */ div.s $f0, $f0, $f2 -/* C9F1D0 802412B0 46040582 */ mul.s $f22, $f0, $f4 -/* C9F1D4 802412B4 00000000 */ nop -/* C9F1D8 802412B8 4618A501 */ sub.s $f20, $f20, $f24 -/* C9F1DC 802412BC 3C013F00 */ lui $at, 0x3f00 -/* C9F1E0 802412C0 44810000 */ mtc1 $at, $f0 -/* C9F1E4 802412C4 00000000 */ nop -/* C9F1E8 802412C8 4600A502 */ mul.s $f20, $f20, $f0 -/* C9F1EC 802412CC 00000000 */ nop -/* C9F1F0 802412D0 12000007 */ beqz $s0, .L802412F0 -/* C9F1F4 802412D4 0233102A */ slt $v0, $s1, $s3 -/* C9F1F8 802412D8 10400005 */ beqz $v0, .L802412F0 -/* C9F1FC 802412DC 0240202D */ daddu $a0, $s2, $zero -/* C9F200 802412E0 0220982D */ daddu $s3, $s1, $zero -/* C9F204 802412E4 0280282D */ daddu $a1, $s4, $zero -/* C9F208 802412E8 0C0B2026 */ jal set_variable -/* C9F20C 802412EC 0220302D */ daddu $a2, $s1, $zero -.L802412F0: -/* C9F210 802412F0 3C014049 */ lui $at, 0x4049 -/* C9F214 802412F4 34210FD8 */ ori $at, $at, 0xfd8 -/* C9F218 802412F8 44810000 */ mtc1 $at, $f0 -/* C9F21C 802412FC 44936000 */ mtc1 $s3, $f12 -/* C9F220 80241300 00000000 */ nop -/* C9F224 80241304 46806320 */ cvt.s.w $f12, $f12 -/* C9F228 80241308 46006302 */ mul.s $f12, $f12, $f0 -/* C9F22C 8024130C 00000000 */ nop -/* C9F230 80241310 44910000 */ mtc1 $s1, $f0 -/* C9F234 80241314 00000000 */ nop -/* C9F238 80241318 46800020 */ cvt.s.w $f0, $f0 -/* C9F23C 8024131C 46006303 */ div.s $f12, $f12, $f0 -/* C9F240 80241320 0C00A874 */ jal cos_rad -/* C9F244 80241324 46166300 */ add.s $f12, $f12, $f22 -/* C9F248 80241328 4600A002 */ mul.s $f0, $f20, $f0 -/* C9F24C 8024132C 00000000 */ nop -/* C9F250 80241330 4614C080 */ add.s $f2, $f24, $f20 -/* C9F254 80241334 46001081 */ sub.s $f2, $f2, $f0 -/* C9F258 80241338 0240202D */ daddu $a0, $s2, $zero -/* C9F25C 8024133C 44061000 */ mfc1 $a2, $f2 -/* C9F260 80241340 0C0B2190 */ jal set_float_variable -/* C9F264 80241344 02A0282D */ daddu $a1, $s5, $zero -/* C9F268 80241348 8FBF0028 */ lw $ra, 0x28($sp) -/* C9F26C 8024134C 8FB50024 */ lw $s5, 0x24($sp) -/* C9F270 80241350 8FB40020 */ lw $s4, 0x20($sp) -/* C9F274 80241354 8FB3001C */ lw $s3, 0x1c($sp) -/* C9F278 80241358 8FB20018 */ lw $s2, 0x18($sp) -/* C9F27C 8024135C 8FB10014 */ lw $s1, 0x14($sp) -/* C9F280 80241360 8FB00010 */ lw $s0, 0x10($sp) -/* C9F284 80241364 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C9F288 80241368 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C9F28C 8024136C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C9F290 80241370 24020002 */ addiu $v0, $zero, 2 -/* C9F294 80241374 03E00008 */ jr $ra -/* C9F298 80241378 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240394_CDCA34.s b/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240394_CDCA34.s deleted file mode 100644 index 3153127742..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240394_CDCA34.s +++ /dev/null @@ -1,108 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_CDCA34 -/* CDCA34 80240394 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CDCA38 80240398 AFB20018 */ sw $s2, 0x18($sp) -/* CDCA3C 8024039C 0080902D */ daddu $s2, $a0, $zero -/* CDCA40 802403A0 AFBF0028 */ sw $ra, 0x28($sp) -/* CDCA44 802403A4 AFB50024 */ sw $s5, 0x24($sp) -/* CDCA48 802403A8 AFB40020 */ sw $s4, 0x20($sp) -/* CDCA4C 802403AC AFB3001C */ sw $s3, 0x1c($sp) -/* CDCA50 802403B0 AFB10014 */ sw $s1, 0x14($sp) -/* CDCA54 802403B4 AFB00010 */ sw $s0, 0x10($sp) -/* CDCA58 802403B8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* CDCA5C 802403BC F7B60038 */ sdc1 $f22, 0x38($sp) -/* CDCA60 802403C0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* CDCA64 802403C4 8E50000C */ lw $s0, 0xc($s2) -/* CDCA68 802403C8 8E140000 */ lw $s4, ($s0) -/* CDCA6C 802403CC 26100004 */ addiu $s0, $s0, 4 -/* CDCA70 802403D0 0C0B1EAF */ jal get_variable -/* CDCA74 802403D4 0280282D */ daddu $a1, $s4, $zero -/* CDCA78 802403D8 0040982D */ daddu $s3, $v0, $zero -/* CDCA7C 802403DC 8E150000 */ lw $s5, ($s0) -/* CDCA80 802403E0 26100004 */ addiu $s0, $s0, 4 -/* CDCA84 802403E4 8E050000 */ lw $a1, ($s0) -/* CDCA88 802403E8 26100004 */ addiu $s0, $s0, 4 -/* CDCA8C 802403EC 0C0B210B */ jal get_float_variable -/* CDCA90 802403F0 0240202D */ daddu $a0, $s2, $zero -/* CDCA94 802403F4 8E050000 */ lw $a1, ($s0) -/* CDCA98 802403F8 26100004 */ addiu $s0, $s0, 4 -/* CDCA9C 802403FC 0240202D */ daddu $a0, $s2, $zero -/* CDCAA0 80240400 0C0B210B */ jal get_float_variable -/* CDCAA4 80240404 46000606 */ mov.s $f24, $f0 -/* CDCAA8 80240408 8E050000 */ lw $a1, ($s0) -/* CDCAAC 8024040C 26100004 */ addiu $s0, $s0, 4 -/* CDCAB0 80240410 0240202D */ daddu $a0, $s2, $zero -/* CDCAB4 80240414 0C0B1EAF */ jal get_variable -/* CDCAB8 80240418 46000506 */ mov.s $f20, $f0 -/* CDCABC 8024041C 8E050000 */ lw $a1, ($s0) -/* CDCAC0 80240420 26100004 */ addiu $s0, $s0, 4 -/* CDCAC4 80240424 0240202D */ daddu $a0, $s2, $zero -/* CDCAC8 80240428 0C0B1EAF */ jal get_variable -/* CDCACC 8024042C 0040882D */ daddu $s1, $v0, $zero -/* CDCAD0 80240430 0240202D */ daddu $a0, $s2, $zero -/* CDCAD4 80240434 8E050000 */ lw $a1, ($s0) -/* CDCAD8 80240438 0C0B210B */ jal get_float_variable -/* CDCADC 8024043C 0040802D */ daddu $s0, $v0, $zero -/* CDCAE0 80240440 3C014334 */ lui $at, 0x4334 -/* CDCAE4 80240444 44811000 */ mtc1 $at, $f2 -/* CDCAE8 80240448 3C014049 */ lui $at, 0x4049 -/* CDCAEC 8024044C 34210FD8 */ ori $at, $at, 0xfd8 -/* CDCAF0 80240450 44812000 */ mtc1 $at, $f4 -/* CDCAF4 80240454 46020003 */ div.s $f0, $f0, $f2 -/* CDCAF8 80240458 46040582 */ mul.s $f22, $f0, $f4 -/* CDCAFC 8024045C 00000000 */ nop -/* CDCB00 80240460 4618A501 */ sub.s $f20, $f20, $f24 -/* CDCB04 80240464 3C013F00 */ lui $at, 0x3f00 -/* CDCB08 80240468 44810000 */ mtc1 $at, $f0 -/* CDCB0C 8024046C 00000000 */ nop -/* CDCB10 80240470 4600A502 */ mul.s $f20, $f20, $f0 -/* CDCB14 80240474 00000000 */ nop -/* CDCB18 80240478 12000007 */ beqz $s0, .L80240498 -/* CDCB1C 8024047C 0233102A */ slt $v0, $s1, $s3 -/* CDCB20 80240480 10400005 */ beqz $v0, .L80240498 -/* CDCB24 80240484 0240202D */ daddu $a0, $s2, $zero -/* CDCB28 80240488 0220982D */ daddu $s3, $s1, $zero -/* CDCB2C 8024048C 0280282D */ daddu $a1, $s4, $zero -/* CDCB30 80240490 0C0B2026 */ jal set_variable -/* CDCB34 80240494 0220302D */ daddu $a2, $s1, $zero -.L80240498: -/* CDCB38 80240498 3C014049 */ lui $at, 0x4049 -/* CDCB3C 8024049C 34210FD8 */ ori $at, $at, 0xfd8 -/* CDCB40 802404A0 44810000 */ mtc1 $at, $f0 -/* CDCB44 802404A4 44936000 */ mtc1 $s3, $f12 -/* CDCB48 802404A8 00000000 */ nop -/* CDCB4C 802404AC 46806320 */ cvt.s.w $f12, $f12 -/* CDCB50 802404B0 46006302 */ mul.s $f12, $f12, $f0 -/* CDCB54 802404B4 00000000 */ nop -/* CDCB58 802404B8 44910000 */ mtc1 $s1, $f0 -/* CDCB5C 802404BC 00000000 */ nop -/* CDCB60 802404C0 46800020 */ cvt.s.w $f0, $f0 -/* CDCB64 802404C4 46006303 */ div.s $f12, $f12, $f0 -/* CDCB68 802404C8 0C00A874 */ jal cos_rad -/* CDCB6C 802404CC 46166300 */ add.s $f12, $f12, $f22 -/* CDCB70 802404D0 4600A002 */ mul.s $f0, $f20, $f0 -/* CDCB74 802404D4 00000000 */ nop -/* CDCB78 802404D8 4614C080 */ add.s $f2, $f24, $f20 -/* CDCB7C 802404DC 46001081 */ sub.s $f2, $f2, $f0 -/* CDCB80 802404E0 0240202D */ daddu $a0, $s2, $zero -/* CDCB84 802404E4 44061000 */ mfc1 $a2, $f2 -/* CDCB88 802404E8 0C0B2190 */ jal set_float_variable -/* CDCB8C 802404EC 02A0282D */ daddu $a1, $s5, $zero -/* CDCB90 802404F0 8FBF0028 */ lw $ra, 0x28($sp) -/* CDCB94 802404F4 8FB50024 */ lw $s5, 0x24($sp) -/* CDCB98 802404F8 8FB40020 */ lw $s4, 0x20($sp) -/* CDCB9C 802404FC 8FB3001C */ lw $s3, 0x1c($sp) -/* CDCBA0 80240500 8FB20018 */ lw $s2, 0x18($sp) -/* CDCBA4 80240504 8FB10014 */ lw $s1, 0x14($sp) -/* CDCBA8 80240508 8FB00010 */ lw $s0, 0x10($sp) -/* CDCBAC 8024050C D7B80040 */ ldc1 $f24, 0x40($sp) -/* CDCBB0 80240510 D7B60038 */ ldc1 $f22, 0x38($sp) -/* CDCBB4 80240514 D7B40030 */ ldc1 $f20, 0x30($sp) -/* CDCBB8 80240518 24020002 */ addiu $v0, $zero, 2 -/* CDCBBC 8024051C 03E00008 */ jr $ra -/* CDCBC0 80240520 27BD0048 */ addiu $sp, $sp, 0x48 -/* CDCBC4 80240524 00000000 */ nop -/* CDCBC8 80240528 00000000 */ nop -/* CDCBCC 8024052C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_802407B0_CE3EA0.s b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_802407B0_CE3EA0.s deleted file mode 100644 index c965900974..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_802407B0_CE3EA0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407B0_CE3EA0 -/* CE3EA0 802407B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CE3EA4 802407B4 AFB20018 */ sw $s2, 0x18($sp) -/* CE3EA8 802407B8 0080902D */ daddu $s2, $a0, $zero -/* CE3EAC 802407BC AFBF0028 */ sw $ra, 0x28($sp) -/* CE3EB0 802407C0 AFB50024 */ sw $s5, 0x24($sp) -/* CE3EB4 802407C4 AFB40020 */ sw $s4, 0x20($sp) -/* CE3EB8 802407C8 AFB3001C */ sw $s3, 0x1c($sp) -/* CE3EBC 802407CC AFB10014 */ sw $s1, 0x14($sp) -/* CE3EC0 802407D0 AFB00010 */ sw $s0, 0x10($sp) -/* CE3EC4 802407D4 F7B80040 */ sdc1 $f24, 0x40($sp) -/* CE3EC8 802407D8 F7B60038 */ sdc1 $f22, 0x38($sp) -/* CE3ECC 802407DC F7B40030 */ sdc1 $f20, 0x30($sp) -/* CE3ED0 802407E0 8E50000C */ lw $s0, 0xc($s2) -/* CE3ED4 802407E4 8E140000 */ lw $s4, ($s0) -/* CE3ED8 802407E8 26100004 */ addiu $s0, $s0, 4 -/* CE3EDC 802407EC 0C0B1EAF */ jal get_variable -/* CE3EE0 802407F0 0280282D */ daddu $a1, $s4, $zero -/* CE3EE4 802407F4 0040982D */ daddu $s3, $v0, $zero -/* CE3EE8 802407F8 8E150000 */ lw $s5, ($s0) -/* CE3EEC 802407FC 26100004 */ addiu $s0, $s0, 4 -/* CE3EF0 80240800 8E050000 */ lw $a1, ($s0) -/* CE3EF4 80240804 26100004 */ addiu $s0, $s0, 4 -/* CE3EF8 80240808 0C0B210B */ jal get_float_variable -/* CE3EFC 8024080C 0240202D */ daddu $a0, $s2, $zero -/* CE3F00 80240810 8E050000 */ lw $a1, ($s0) -/* CE3F04 80240814 26100004 */ addiu $s0, $s0, 4 -/* CE3F08 80240818 0240202D */ daddu $a0, $s2, $zero -/* CE3F0C 8024081C 0C0B210B */ jal get_float_variable -/* CE3F10 80240820 46000606 */ mov.s $f24, $f0 -/* CE3F14 80240824 8E050000 */ lw $a1, ($s0) -/* CE3F18 80240828 26100004 */ addiu $s0, $s0, 4 -/* CE3F1C 8024082C 0240202D */ daddu $a0, $s2, $zero -/* CE3F20 80240830 0C0B1EAF */ jal get_variable -/* CE3F24 80240834 46000506 */ mov.s $f20, $f0 -/* CE3F28 80240838 8E050000 */ lw $a1, ($s0) -/* CE3F2C 8024083C 26100004 */ addiu $s0, $s0, 4 -/* CE3F30 80240840 0240202D */ daddu $a0, $s2, $zero -/* CE3F34 80240844 0C0B1EAF */ jal get_variable -/* CE3F38 80240848 0040882D */ daddu $s1, $v0, $zero -/* CE3F3C 8024084C 0240202D */ daddu $a0, $s2, $zero -/* CE3F40 80240850 8E050000 */ lw $a1, ($s0) -/* CE3F44 80240854 0C0B210B */ jal get_float_variable -/* CE3F48 80240858 0040802D */ daddu $s0, $v0, $zero -/* CE3F4C 8024085C 3C014334 */ lui $at, 0x4334 -/* CE3F50 80240860 44811000 */ mtc1 $at, $f2 -/* CE3F54 80240864 3C014049 */ lui $at, 0x4049 -/* CE3F58 80240868 34210FD8 */ ori $at, $at, 0xfd8 -/* CE3F5C 8024086C 44812000 */ mtc1 $at, $f4 -/* CE3F60 80240870 46020003 */ div.s $f0, $f0, $f2 -/* CE3F64 80240874 46040582 */ mul.s $f22, $f0, $f4 -/* CE3F68 80240878 00000000 */ nop -/* CE3F6C 8024087C 4618A501 */ sub.s $f20, $f20, $f24 -/* CE3F70 80240880 3C013F00 */ lui $at, 0x3f00 -/* CE3F74 80240884 44810000 */ mtc1 $at, $f0 -/* CE3F78 80240888 00000000 */ nop -/* CE3F7C 8024088C 4600A502 */ mul.s $f20, $f20, $f0 -/* CE3F80 80240890 00000000 */ nop -/* CE3F84 80240894 12000007 */ beqz $s0, .L802408B4 -/* CE3F88 80240898 0233102A */ slt $v0, $s1, $s3 -/* CE3F8C 8024089C 10400005 */ beqz $v0, .L802408B4 -/* CE3F90 802408A0 0240202D */ daddu $a0, $s2, $zero -/* CE3F94 802408A4 0220982D */ daddu $s3, $s1, $zero -/* CE3F98 802408A8 0280282D */ daddu $a1, $s4, $zero -/* CE3F9C 802408AC 0C0B2026 */ jal set_variable -/* CE3FA0 802408B0 0220302D */ daddu $a2, $s1, $zero -.L802408B4: -/* CE3FA4 802408B4 3C014049 */ lui $at, 0x4049 -/* CE3FA8 802408B8 34210FD8 */ ori $at, $at, 0xfd8 -/* CE3FAC 802408BC 44810000 */ mtc1 $at, $f0 -/* CE3FB0 802408C0 44936000 */ mtc1 $s3, $f12 -/* CE3FB4 802408C4 00000000 */ nop -/* CE3FB8 802408C8 46806320 */ cvt.s.w $f12, $f12 -/* CE3FBC 802408CC 46006302 */ mul.s $f12, $f12, $f0 -/* CE3FC0 802408D0 00000000 */ nop -/* CE3FC4 802408D4 44910000 */ mtc1 $s1, $f0 -/* CE3FC8 802408D8 00000000 */ nop -/* CE3FCC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* CE3FD0 802408E0 46006303 */ div.s $f12, $f12, $f0 -/* CE3FD4 802408E4 0C00A874 */ jal cos_rad -/* CE3FD8 802408E8 46166300 */ add.s $f12, $f12, $f22 -/* CE3FDC 802408EC 4600A002 */ mul.s $f0, $f20, $f0 -/* CE3FE0 802408F0 00000000 */ nop -/* CE3FE4 802408F4 4614C080 */ add.s $f2, $f24, $f20 -/* CE3FE8 802408F8 46001081 */ sub.s $f2, $f2, $f0 -/* CE3FEC 802408FC 0240202D */ daddu $a0, $s2, $zero -/* CE3FF0 80240900 44061000 */ mfc1 $a2, $f2 -/* CE3FF4 80240904 0C0B2190 */ jal set_float_variable -/* CE3FF8 80240908 02A0282D */ daddu $a1, $s5, $zero -/* CE3FFC 8024090C 8FBF0028 */ lw $ra, 0x28($sp) -/* CE4000 80240910 8FB50024 */ lw $s5, 0x24($sp) -/* CE4004 80240914 8FB40020 */ lw $s4, 0x20($sp) -/* CE4008 80240918 8FB3001C */ lw $s3, 0x1c($sp) -/* CE400C 8024091C 8FB20018 */ lw $s2, 0x18($sp) -/* CE4010 80240920 8FB10014 */ lw $s1, 0x14($sp) -/* CE4014 80240924 8FB00010 */ lw $s0, 0x10($sp) -/* CE4018 80240928 D7B80040 */ ldc1 $f24, 0x40($sp) -/* CE401C 8024092C D7B60038 */ ldc1 $f22, 0x38($sp) -/* CE4020 80240930 D7B40030 */ ldc1 $f20, 0x30($sp) -/* CE4024 80240934 24020002 */ addiu $v0, $zero, 2 -/* CE4028 80240938 03E00008 */ jr $ra -/* CE402C 8024093C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40_CE7240.s b/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40_CE7240.s deleted file mode 100644 index 9619b06d10..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40_CE7240.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B40_CE7240 -/* CE7240 80240B40 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CE7244 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* CE7248 80240B48 0080902D */ daddu $s2, $a0, $zero -/* CE724C 80240B4C AFBF0028 */ sw $ra, 0x28($sp) -/* CE7250 80240B50 AFB50024 */ sw $s5, 0x24($sp) -/* CE7254 80240B54 AFB40020 */ sw $s4, 0x20($sp) -/* CE7258 80240B58 AFB3001C */ sw $s3, 0x1c($sp) -/* CE725C 80240B5C AFB10014 */ sw $s1, 0x14($sp) -/* CE7260 80240B60 AFB00010 */ sw $s0, 0x10($sp) -/* CE7264 80240B64 F7B80040 */ sdc1 $f24, 0x40($sp) -/* CE7268 80240B68 F7B60038 */ sdc1 $f22, 0x38($sp) -/* CE726C 80240B6C F7B40030 */ sdc1 $f20, 0x30($sp) -/* CE7270 80240B70 8E50000C */ lw $s0, 0xc($s2) -/* CE7274 80240B74 8E140000 */ lw $s4, ($s0) -/* CE7278 80240B78 26100004 */ addiu $s0, $s0, 4 -/* CE727C 80240B7C 0C0B1EAF */ jal get_variable -/* CE7280 80240B80 0280282D */ daddu $a1, $s4, $zero -/* CE7284 80240B84 0040982D */ daddu $s3, $v0, $zero -/* CE7288 80240B88 8E150000 */ lw $s5, ($s0) -/* CE728C 80240B8C 26100004 */ addiu $s0, $s0, 4 -/* CE7290 80240B90 8E050000 */ lw $a1, ($s0) -/* CE7294 80240B94 26100004 */ addiu $s0, $s0, 4 -/* CE7298 80240B98 0C0B210B */ jal get_float_variable -/* CE729C 80240B9C 0240202D */ daddu $a0, $s2, $zero -/* CE72A0 80240BA0 8E050000 */ lw $a1, ($s0) -/* CE72A4 80240BA4 26100004 */ addiu $s0, $s0, 4 -/* CE72A8 80240BA8 0240202D */ daddu $a0, $s2, $zero -/* CE72AC 80240BAC 0C0B210B */ jal get_float_variable -/* CE72B0 80240BB0 46000606 */ mov.s $f24, $f0 -/* CE72B4 80240BB4 8E050000 */ lw $a1, ($s0) -/* CE72B8 80240BB8 26100004 */ addiu $s0, $s0, 4 -/* CE72BC 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* CE72C0 80240BC0 0C0B1EAF */ jal get_variable -/* CE72C4 80240BC4 46000506 */ mov.s $f20, $f0 -/* CE72C8 80240BC8 8E050000 */ lw $a1, ($s0) -/* CE72CC 80240BCC 26100004 */ addiu $s0, $s0, 4 -/* CE72D0 80240BD0 0240202D */ daddu $a0, $s2, $zero -/* CE72D4 80240BD4 0C0B1EAF */ jal get_variable -/* CE72D8 80240BD8 0040882D */ daddu $s1, $v0, $zero -/* CE72DC 80240BDC 0240202D */ daddu $a0, $s2, $zero -/* CE72E0 80240BE0 8E050000 */ lw $a1, ($s0) -/* CE72E4 80240BE4 0C0B210B */ jal get_float_variable -/* CE72E8 80240BE8 0040802D */ daddu $s0, $v0, $zero -/* CE72EC 80240BEC 3C014334 */ lui $at, 0x4334 -/* CE72F0 80240BF0 44811000 */ mtc1 $at, $f2 -/* CE72F4 80240BF4 3C014049 */ lui $at, 0x4049 -/* CE72F8 80240BF8 34210FD8 */ ori $at, $at, 0xfd8 -/* CE72FC 80240BFC 44812000 */ mtc1 $at, $f4 -/* CE7300 80240C00 46020003 */ div.s $f0, $f0, $f2 -/* CE7304 80240C04 46040582 */ mul.s $f22, $f0, $f4 -/* CE7308 80240C08 00000000 */ nop -/* CE730C 80240C0C 4618A501 */ sub.s $f20, $f20, $f24 -/* CE7310 80240C10 3C013F00 */ lui $at, 0x3f00 -/* CE7314 80240C14 44810000 */ mtc1 $at, $f0 -/* CE7318 80240C18 00000000 */ nop -/* CE731C 80240C1C 4600A502 */ mul.s $f20, $f20, $f0 -/* CE7320 80240C20 00000000 */ nop -/* CE7324 80240C24 12000007 */ beqz $s0, .L80240C44 -/* CE7328 80240C28 0233102A */ slt $v0, $s1, $s3 -/* CE732C 80240C2C 10400005 */ beqz $v0, .L80240C44 -/* CE7330 80240C30 0240202D */ daddu $a0, $s2, $zero -/* CE7334 80240C34 0220982D */ daddu $s3, $s1, $zero -/* CE7338 80240C38 0280282D */ daddu $a1, $s4, $zero -/* CE733C 80240C3C 0C0B2026 */ jal set_variable -/* CE7340 80240C40 0220302D */ daddu $a2, $s1, $zero -.L80240C44: -/* CE7344 80240C44 3C014049 */ lui $at, 0x4049 -/* CE7348 80240C48 34210FD8 */ ori $at, $at, 0xfd8 -/* CE734C 80240C4C 44810000 */ mtc1 $at, $f0 -/* CE7350 80240C50 44936000 */ mtc1 $s3, $f12 -/* CE7354 80240C54 00000000 */ nop -/* CE7358 80240C58 46806320 */ cvt.s.w $f12, $f12 -/* CE735C 80240C5C 46006302 */ mul.s $f12, $f12, $f0 -/* CE7360 80240C60 00000000 */ nop -/* CE7364 80240C64 44910000 */ mtc1 $s1, $f0 -/* CE7368 80240C68 00000000 */ nop -/* CE736C 80240C6C 46800020 */ cvt.s.w $f0, $f0 -/* CE7370 80240C70 46006303 */ div.s $f12, $f12, $f0 -/* CE7374 80240C74 0C00A874 */ jal cos_rad -/* CE7378 80240C78 46166300 */ add.s $f12, $f12, $f22 -/* CE737C 80240C7C 4600A002 */ mul.s $f0, $f20, $f0 -/* CE7380 80240C80 00000000 */ nop -/* CE7384 80240C84 4614C080 */ add.s $f2, $f24, $f20 -/* CE7388 80240C88 46001081 */ sub.s $f2, $f2, $f0 -/* CE738C 80240C8C 0240202D */ daddu $a0, $s2, $zero -/* CE7390 80240C90 44061000 */ mfc1 $a2, $f2 -/* CE7394 80240C94 0C0B2190 */ jal set_float_variable -/* CE7398 80240C98 02A0282D */ daddu $a1, $s5, $zero -/* CE739C 80240C9C 8FBF0028 */ lw $ra, 0x28($sp) -/* CE73A0 80240CA0 8FB50024 */ lw $s5, 0x24($sp) -/* CE73A4 80240CA4 8FB40020 */ lw $s4, 0x20($sp) -/* CE73A8 80240CA8 8FB3001C */ lw $s3, 0x1c($sp) -/* CE73AC 80240CAC 8FB20018 */ lw $s2, 0x18($sp) -/* CE73B0 80240CB0 8FB10014 */ lw $s1, 0x14($sp) -/* CE73B4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* CE73B8 80240CB8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* CE73BC 80240CBC D7B60038 */ ldc1 $f22, 0x38($sp) -/* CE73C0 80240CC0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* CE73C4 80240CC4 24020002 */ addiu $v0, $zero, 2 -/* CE73C8 80240CC8 03E00008 */ jr $ra -/* CE73CC 80240CCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240160_91E6D0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240160_91E6D0.s deleted file mode 100644 index c7ece9fa2e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240160_91E6D0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_91E6D0 -/* 91E6D0 80240160 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 91E6D4 80240164 AFB20018 */ sw $s2, 0x18($sp) -/* 91E6D8 80240168 0080902D */ daddu $s2, $a0, $zero -/* 91E6DC 8024016C AFBF0028 */ sw $ra, 0x28($sp) -/* 91E6E0 80240170 AFB50024 */ sw $s5, 0x24($sp) -/* 91E6E4 80240174 AFB40020 */ sw $s4, 0x20($sp) -/* 91E6E8 80240178 AFB3001C */ sw $s3, 0x1c($sp) -/* 91E6EC 8024017C AFB10014 */ sw $s1, 0x14($sp) -/* 91E6F0 80240180 AFB00010 */ sw $s0, 0x10($sp) -/* 91E6F4 80240184 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 91E6F8 80240188 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 91E6FC 8024018C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 91E700 80240190 8E50000C */ lw $s0, 0xc($s2) -/* 91E704 80240194 8E140000 */ lw $s4, ($s0) -/* 91E708 80240198 26100004 */ addiu $s0, $s0, 4 -/* 91E70C 8024019C 0C0B1EAF */ jal get_variable -/* 91E710 802401A0 0280282D */ daddu $a1, $s4, $zero -/* 91E714 802401A4 0040982D */ daddu $s3, $v0, $zero -/* 91E718 802401A8 8E150000 */ lw $s5, ($s0) -/* 91E71C 802401AC 26100004 */ addiu $s0, $s0, 4 -/* 91E720 802401B0 8E050000 */ lw $a1, ($s0) -/* 91E724 802401B4 26100004 */ addiu $s0, $s0, 4 -/* 91E728 802401B8 0C0B210B */ jal get_float_variable -/* 91E72C 802401BC 0240202D */ daddu $a0, $s2, $zero -/* 91E730 802401C0 8E050000 */ lw $a1, ($s0) -/* 91E734 802401C4 26100004 */ addiu $s0, $s0, 4 -/* 91E738 802401C8 0240202D */ daddu $a0, $s2, $zero -/* 91E73C 802401CC 0C0B210B */ jal get_float_variable -/* 91E740 802401D0 46000606 */ mov.s $f24, $f0 -/* 91E744 802401D4 8E050000 */ lw $a1, ($s0) -/* 91E748 802401D8 26100004 */ addiu $s0, $s0, 4 -/* 91E74C 802401DC 0240202D */ daddu $a0, $s2, $zero -/* 91E750 802401E0 0C0B1EAF */ jal get_variable -/* 91E754 802401E4 46000506 */ mov.s $f20, $f0 -/* 91E758 802401E8 8E050000 */ lw $a1, ($s0) -/* 91E75C 802401EC 26100004 */ addiu $s0, $s0, 4 -/* 91E760 802401F0 0240202D */ daddu $a0, $s2, $zero -/* 91E764 802401F4 0C0B1EAF */ jal get_variable -/* 91E768 802401F8 0040882D */ daddu $s1, $v0, $zero -/* 91E76C 802401FC 0240202D */ daddu $a0, $s2, $zero -/* 91E770 80240200 8E050000 */ lw $a1, ($s0) -/* 91E774 80240204 0C0B210B */ jal get_float_variable -/* 91E778 80240208 0040802D */ daddu $s0, $v0, $zero -/* 91E77C 8024020C 3C014334 */ lui $at, 0x4334 -/* 91E780 80240210 44811000 */ mtc1 $at, $f2 -/* 91E784 80240214 3C014049 */ lui $at, 0x4049 -/* 91E788 80240218 34210FD8 */ ori $at, $at, 0xfd8 -/* 91E78C 8024021C 44812000 */ mtc1 $at, $f4 -/* 91E790 80240220 46020003 */ div.s $f0, $f0, $f2 -/* 91E794 80240224 46040582 */ mul.s $f22, $f0, $f4 -/* 91E798 80240228 00000000 */ nop -/* 91E79C 8024022C 4618A501 */ sub.s $f20, $f20, $f24 -/* 91E7A0 80240230 3C013F00 */ lui $at, 0x3f00 -/* 91E7A4 80240234 44810000 */ mtc1 $at, $f0 -/* 91E7A8 80240238 00000000 */ nop -/* 91E7AC 8024023C 4600A502 */ mul.s $f20, $f20, $f0 -/* 91E7B0 80240240 00000000 */ nop -/* 91E7B4 80240244 12000007 */ beqz $s0, .L80240264 -/* 91E7B8 80240248 0233102A */ slt $v0, $s1, $s3 -/* 91E7BC 8024024C 10400005 */ beqz $v0, .L80240264 -/* 91E7C0 80240250 0240202D */ daddu $a0, $s2, $zero -/* 91E7C4 80240254 0220982D */ daddu $s3, $s1, $zero -/* 91E7C8 80240258 0280282D */ daddu $a1, $s4, $zero -/* 91E7CC 8024025C 0C0B2026 */ jal set_variable -/* 91E7D0 80240260 0220302D */ daddu $a2, $s1, $zero -.L80240264: -/* 91E7D4 80240264 3C014049 */ lui $at, 0x4049 -/* 91E7D8 80240268 34210FD8 */ ori $at, $at, 0xfd8 -/* 91E7DC 8024026C 44810000 */ mtc1 $at, $f0 -/* 91E7E0 80240270 44936000 */ mtc1 $s3, $f12 -/* 91E7E4 80240274 00000000 */ nop -/* 91E7E8 80240278 46806320 */ cvt.s.w $f12, $f12 -/* 91E7EC 8024027C 46006302 */ mul.s $f12, $f12, $f0 -/* 91E7F0 80240280 00000000 */ nop -/* 91E7F4 80240284 44910000 */ mtc1 $s1, $f0 -/* 91E7F8 80240288 00000000 */ nop -/* 91E7FC 8024028C 46800020 */ cvt.s.w $f0, $f0 -/* 91E800 80240290 46006303 */ div.s $f12, $f12, $f0 -/* 91E804 80240294 0C00A874 */ jal cos_rad -/* 91E808 80240298 46166300 */ add.s $f12, $f12, $f22 -/* 91E80C 8024029C 4600A002 */ mul.s $f0, $f20, $f0 -/* 91E810 802402A0 00000000 */ nop -/* 91E814 802402A4 4614C080 */ add.s $f2, $f24, $f20 -/* 91E818 802402A8 46001081 */ sub.s $f2, $f2, $f0 -/* 91E81C 802402AC 0240202D */ daddu $a0, $s2, $zero -/* 91E820 802402B0 44061000 */ mfc1 $a2, $f2 -/* 91E824 802402B4 0C0B2190 */ jal set_float_variable -/* 91E828 802402B8 02A0282D */ daddu $a1, $s5, $zero -/* 91E82C 802402BC 8FBF0028 */ lw $ra, 0x28($sp) -/* 91E830 802402C0 8FB50024 */ lw $s5, 0x24($sp) -/* 91E834 802402C4 8FB40020 */ lw $s4, 0x20($sp) -/* 91E838 802402C8 8FB3001C */ lw $s3, 0x1c($sp) -/* 91E83C 802402CC 8FB20018 */ lw $s2, 0x18($sp) -/* 91E840 802402D0 8FB10014 */ lw $s1, 0x14($sp) -/* 91E844 802402D4 8FB00010 */ lw $s0, 0x10($sp) -/* 91E848 802402D8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 91E84C 802402DC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 91E850 802402E0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 91E854 802402E4 24020002 */ addiu $v0, $zero, 2 -/* 91E858 802402E8 03E00008 */ jr $ra -/* 91E85C 802402EC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240020_926A10.s b/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240020_926A10.s deleted file mode 100644 index d5a5692866..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240020_926A10.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_926A10 -/* 926A10 80240020 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 926A14 80240024 AFB20018 */ sw $s2, 0x18($sp) -/* 926A18 80240028 0080902D */ daddu $s2, $a0, $zero -/* 926A1C 8024002C AFBF0028 */ sw $ra, 0x28($sp) -/* 926A20 80240030 AFB50024 */ sw $s5, 0x24($sp) -/* 926A24 80240034 AFB40020 */ sw $s4, 0x20($sp) -/* 926A28 80240038 AFB3001C */ sw $s3, 0x1c($sp) -/* 926A2C 8024003C AFB10014 */ sw $s1, 0x14($sp) -/* 926A30 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 926A34 80240044 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 926A38 80240048 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 926A3C 8024004C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 926A40 80240050 8E50000C */ lw $s0, 0xc($s2) -/* 926A44 80240054 8E140000 */ lw $s4, ($s0) -/* 926A48 80240058 26100004 */ addiu $s0, $s0, 4 -/* 926A4C 8024005C 0C0B1EAF */ jal get_variable -/* 926A50 80240060 0280282D */ daddu $a1, $s4, $zero -/* 926A54 80240064 0040982D */ daddu $s3, $v0, $zero -/* 926A58 80240068 8E150000 */ lw $s5, ($s0) -/* 926A5C 8024006C 26100004 */ addiu $s0, $s0, 4 -/* 926A60 80240070 8E050000 */ lw $a1, ($s0) -/* 926A64 80240074 26100004 */ addiu $s0, $s0, 4 -/* 926A68 80240078 0C0B210B */ jal get_float_variable -/* 926A6C 8024007C 0240202D */ daddu $a0, $s2, $zero -/* 926A70 80240080 8E050000 */ lw $a1, ($s0) -/* 926A74 80240084 26100004 */ addiu $s0, $s0, 4 -/* 926A78 80240088 0240202D */ daddu $a0, $s2, $zero -/* 926A7C 8024008C 0C0B210B */ jal get_float_variable -/* 926A80 80240090 46000606 */ mov.s $f24, $f0 -/* 926A84 80240094 8E050000 */ lw $a1, ($s0) -/* 926A88 80240098 26100004 */ addiu $s0, $s0, 4 -/* 926A8C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* 926A90 802400A0 0C0B1EAF */ jal get_variable -/* 926A94 802400A4 46000506 */ mov.s $f20, $f0 -/* 926A98 802400A8 8E050000 */ lw $a1, ($s0) -/* 926A9C 802400AC 26100004 */ addiu $s0, $s0, 4 -/* 926AA0 802400B0 0240202D */ daddu $a0, $s2, $zero -/* 926AA4 802400B4 0C0B1EAF */ jal get_variable -/* 926AA8 802400B8 0040882D */ daddu $s1, $v0, $zero -/* 926AAC 802400BC 0240202D */ daddu $a0, $s2, $zero -/* 926AB0 802400C0 8E050000 */ lw $a1, ($s0) -/* 926AB4 802400C4 0C0B210B */ jal get_float_variable -/* 926AB8 802400C8 0040802D */ daddu $s0, $v0, $zero -/* 926ABC 802400CC 3C014334 */ lui $at, 0x4334 -/* 926AC0 802400D0 44811000 */ mtc1 $at, $f2 -/* 926AC4 802400D4 3C014049 */ lui $at, 0x4049 -/* 926AC8 802400D8 34210FD8 */ ori $at, $at, 0xfd8 -/* 926ACC 802400DC 44812000 */ mtc1 $at, $f4 -/* 926AD0 802400E0 46020003 */ div.s $f0, $f0, $f2 -/* 926AD4 802400E4 46040582 */ mul.s $f22, $f0, $f4 -/* 926AD8 802400E8 00000000 */ nop -/* 926ADC 802400EC 4618A501 */ sub.s $f20, $f20, $f24 -/* 926AE0 802400F0 3C013F00 */ lui $at, 0x3f00 -/* 926AE4 802400F4 44810000 */ mtc1 $at, $f0 -/* 926AE8 802400F8 00000000 */ nop -/* 926AEC 802400FC 4600A502 */ mul.s $f20, $f20, $f0 -/* 926AF0 80240100 00000000 */ nop -/* 926AF4 80240104 12000007 */ beqz $s0, .L80240124 -/* 926AF8 80240108 0233102A */ slt $v0, $s1, $s3 -/* 926AFC 8024010C 10400005 */ beqz $v0, .L80240124 -/* 926B00 80240110 0240202D */ daddu $a0, $s2, $zero -/* 926B04 80240114 0220982D */ daddu $s3, $s1, $zero -/* 926B08 80240118 0280282D */ daddu $a1, $s4, $zero -/* 926B0C 8024011C 0C0B2026 */ jal set_variable -/* 926B10 80240120 0220302D */ daddu $a2, $s1, $zero -.L80240124: -/* 926B14 80240124 3C014049 */ lui $at, 0x4049 -/* 926B18 80240128 34210FD8 */ ori $at, $at, 0xfd8 -/* 926B1C 8024012C 44810000 */ mtc1 $at, $f0 -/* 926B20 80240130 44936000 */ mtc1 $s3, $f12 -/* 926B24 80240134 00000000 */ nop -/* 926B28 80240138 46806320 */ cvt.s.w $f12, $f12 -/* 926B2C 8024013C 46006302 */ mul.s $f12, $f12, $f0 -/* 926B30 80240140 00000000 */ nop -/* 926B34 80240144 44910000 */ mtc1 $s1, $f0 -/* 926B38 80240148 00000000 */ nop -/* 926B3C 8024014C 46800020 */ cvt.s.w $f0, $f0 -/* 926B40 80240150 46006303 */ div.s $f12, $f12, $f0 -/* 926B44 80240154 0C00A874 */ jal cos_rad -/* 926B48 80240158 46166300 */ add.s $f12, $f12, $f22 -/* 926B4C 8024015C 4600A002 */ mul.s $f0, $f20, $f0 -/* 926B50 80240160 00000000 */ nop -/* 926B54 80240164 4614C080 */ add.s $f2, $f24, $f20 -/* 926B58 80240168 46001081 */ sub.s $f2, $f2, $f0 -/* 926B5C 8024016C 0240202D */ daddu $a0, $s2, $zero -/* 926B60 80240170 44061000 */ mfc1 $a2, $f2 -/* 926B64 80240174 0C0B2190 */ jal set_float_variable -/* 926B68 80240178 02A0282D */ daddu $a1, $s5, $zero -/* 926B6C 8024017C 8FBF0028 */ lw $ra, 0x28($sp) -/* 926B70 80240180 8FB50024 */ lw $s5, 0x24($sp) -/* 926B74 80240184 8FB40020 */ lw $s4, 0x20($sp) -/* 926B78 80240188 8FB3001C */ lw $s3, 0x1c($sp) -/* 926B7C 8024018C 8FB20018 */ lw $s2, 0x18($sp) -/* 926B80 80240190 8FB10014 */ lw $s1, 0x14($sp) -/* 926B84 80240194 8FB00010 */ lw $s0, 0x10($sp) -/* 926B88 80240198 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 926B8C 8024019C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 926B90 802401A0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 926B94 802401A4 24020002 */ addiu $v0, $zero, 2 -/* 926B98 802401A8 03E00008 */ jr $ra -/* 926B9C 802401AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320_831B20.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320_831B20.s deleted file mode 100644 index 4c8d50ada9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320_831B20.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_831B20 -/* 831B20 80240320 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 831B24 80240324 AFB20018 */ sw $s2, 0x18($sp) -/* 831B28 80240328 0080902D */ daddu $s2, $a0, $zero -/* 831B2C 8024032C AFBF0028 */ sw $ra, 0x28($sp) -/* 831B30 80240330 AFB50024 */ sw $s5, 0x24($sp) -/* 831B34 80240334 AFB40020 */ sw $s4, 0x20($sp) -/* 831B38 80240338 AFB3001C */ sw $s3, 0x1c($sp) -/* 831B3C 8024033C AFB10014 */ sw $s1, 0x14($sp) -/* 831B40 80240340 AFB00010 */ sw $s0, 0x10($sp) -/* 831B44 80240344 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 831B48 80240348 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 831B4C 8024034C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 831B50 80240350 8E50000C */ lw $s0, 0xc($s2) -/* 831B54 80240354 8E140000 */ lw $s4, ($s0) -/* 831B58 80240358 26100004 */ addiu $s0, $s0, 4 -/* 831B5C 8024035C 0C0B1EAF */ jal get_variable -/* 831B60 80240360 0280282D */ daddu $a1, $s4, $zero -/* 831B64 80240364 0040982D */ daddu $s3, $v0, $zero -/* 831B68 80240368 8E150000 */ lw $s5, ($s0) -/* 831B6C 8024036C 26100004 */ addiu $s0, $s0, 4 -/* 831B70 80240370 8E050000 */ lw $a1, ($s0) -/* 831B74 80240374 26100004 */ addiu $s0, $s0, 4 -/* 831B78 80240378 0C0B210B */ jal get_float_variable -/* 831B7C 8024037C 0240202D */ daddu $a0, $s2, $zero -/* 831B80 80240380 8E050000 */ lw $a1, ($s0) -/* 831B84 80240384 26100004 */ addiu $s0, $s0, 4 -/* 831B88 80240388 0240202D */ daddu $a0, $s2, $zero -/* 831B8C 8024038C 0C0B210B */ jal get_float_variable -/* 831B90 80240390 46000606 */ mov.s $f24, $f0 -/* 831B94 80240394 8E050000 */ lw $a1, ($s0) -/* 831B98 80240398 26100004 */ addiu $s0, $s0, 4 -/* 831B9C 8024039C 0240202D */ daddu $a0, $s2, $zero -/* 831BA0 802403A0 0C0B1EAF */ jal get_variable -/* 831BA4 802403A4 46000506 */ mov.s $f20, $f0 -/* 831BA8 802403A8 8E050000 */ lw $a1, ($s0) -/* 831BAC 802403AC 26100004 */ addiu $s0, $s0, 4 -/* 831BB0 802403B0 0240202D */ daddu $a0, $s2, $zero -/* 831BB4 802403B4 0C0B1EAF */ jal get_variable -/* 831BB8 802403B8 0040882D */ daddu $s1, $v0, $zero -/* 831BBC 802403BC 0240202D */ daddu $a0, $s2, $zero -/* 831BC0 802403C0 8E050000 */ lw $a1, ($s0) -/* 831BC4 802403C4 0C0B210B */ jal get_float_variable -/* 831BC8 802403C8 0040802D */ daddu $s0, $v0, $zero -/* 831BCC 802403CC 3C014334 */ lui $at, 0x4334 -/* 831BD0 802403D0 44811000 */ mtc1 $at, $f2 -/* 831BD4 802403D4 3C014049 */ lui $at, 0x4049 -/* 831BD8 802403D8 34210FD8 */ ori $at, $at, 0xfd8 -/* 831BDC 802403DC 44812000 */ mtc1 $at, $f4 -/* 831BE0 802403E0 46020003 */ div.s $f0, $f0, $f2 -/* 831BE4 802403E4 46040582 */ mul.s $f22, $f0, $f4 -/* 831BE8 802403E8 00000000 */ nop -/* 831BEC 802403EC 4618A501 */ sub.s $f20, $f20, $f24 -/* 831BF0 802403F0 3C013F00 */ lui $at, 0x3f00 -/* 831BF4 802403F4 44810000 */ mtc1 $at, $f0 -/* 831BF8 802403F8 00000000 */ nop -/* 831BFC 802403FC 4600A502 */ mul.s $f20, $f20, $f0 -/* 831C00 80240400 00000000 */ nop -/* 831C04 80240404 12000007 */ beqz $s0, .L80240424 -/* 831C08 80240408 0233102A */ slt $v0, $s1, $s3 -/* 831C0C 8024040C 10400005 */ beqz $v0, .L80240424 -/* 831C10 80240410 0240202D */ daddu $a0, $s2, $zero -/* 831C14 80240414 0220982D */ daddu $s3, $s1, $zero -/* 831C18 80240418 0280282D */ daddu $a1, $s4, $zero -/* 831C1C 8024041C 0C0B2026 */ jal set_variable -/* 831C20 80240420 0220302D */ daddu $a2, $s1, $zero -.L80240424: -/* 831C24 80240424 3C014049 */ lui $at, 0x4049 -/* 831C28 80240428 34210FD8 */ ori $at, $at, 0xfd8 -/* 831C2C 8024042C 44810000 */ mtc1 $at, $f0 -/* 831C30 80240430 44936000 */ mtc1 $s3, $f12 -/* 831C34 80240434 00000000 */ nop -/* 831C38 80240438 46806320 */ cvt.s.w $f12, $f12 -/* 831C3C 8024043C 46006302 */ mul.s $f12, $f12, $f0 -/* 831C40 80240440 00000000 */ nop -/* 831C44 80240444 44910000 */ mtc1 $s1, $f0 -/* 831C48 80240448 00000000 */ nop -/* 831C4C 8024044C 46800020 */ cvt.s.w $f0, $f0 -/* 831C50 80240450 46006303 */ div.s $f12, $f12, $f0 -/* 831C54 80240454 0C00A874 */ jal cos_rad -/* 831C58 80240458 46166300 */ add.s $f12, $f12, $f22 -/* 831C5C 8024045C 4600A002 */ mul.s $f0, $f20, $f0 -/* 831C60 80240460 00000000 */ nop -/* 831C64 80240464 4614C080 */ add.s $f2, $f24, $f20 -/* 831C68 80240468 46001081 */ sub.s $f2, $f2, $f0 -/* 831C6C 8024046C 0240202D */ daddu $a0, $s2, $zero -/* 831C70 80240470 44061000 */ mfc1 $a2, $f2 -/* 831C74 80240474 0C0B2190 */ jal set_float_variable -/* 831C78 80240478 02A0282D */ daddu $a1, $s5, $zero -/* 831C7C 8024047C 8FBF0028 */ lw $ra, 0x28($sp) -/* 831C80 80240480 8FB50024 */ lw $s5, 0x24($sp) -/* 831C84 80240484 8FB40020 */ lw $s4, 0x20($sp) -/* 831C88 80240488 8FB3001C */ lw $s3, 0x1c($sp) -/* 831C8C 8024048C 8FB20018 */ lw $s2, 0x18($sp) -/* 831C90 80240490 8FB10014 */ lw $s1, 0x14($sp) -/* 831C94 80240494 8FB00010 */ lw $s0, 0x10($sp) -/* 831C98 80240498 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 831C9C 8024049C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 831CA0 802404A0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 831CA4 802404A4 24020002 */ addiu $v0, $zero, 2 -/* 831CA8 802404A8 03E00008 */ jr $ra -/* 831CAC 802404AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242514_9C78F4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242514_9C78F4.s deleted file mode 100644 index b2485e32c2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242514_9C78F4.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242514_9C78F4 -/* 9C78F4 80242514 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C78F8 80242518 AFB20018 */ sw $s2, 0x18($sp) -/* 9C78FC 8024251C 0080902D */ daddu $s2, $a0, $zero -/* 9C7900 80242520 AFBF0028 */ sw $ra, 0x28($sp) -/* 9C7904 80242524 AFB50024 */ sw $s5, 0x24($sp) -/* 9C7908 80242528 AFB40020 */ sw $s4, 0x20($sp) -/* 9C790C 8024252C AFB3001C */ sw $s3, 0x1c($sp) -/* 9C7910 80242530 AFB10014 */ sw $s1, 0x14($sp) -/* 9C7914 80242534 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7918 80242538 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9C791C 8024253C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9C7920 80242540 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9C7924 80242544 8E50000C */ lw $s0, 0xc($s2) -/* 9C7928 80242548 8E140000 */ lw $s4, ($s0) -/* 9C792C 8024254C 26100004 */ addiu $s0, $s0, 4 -/* 9C7930 80242550 0C0B1EAF */ jal get_variable -/* 9C7934 80242554 0280282D */ daddu $a1, $s4, $zero -/* 9C7938 80242558 0040982D */ daddu $s3, $v0, $zero -/* 9C793C 8024255C 8E150000 */ lw $s5, ($s0) -/* 9C7940 80242560 26100004 */ addiu $s0, $s0, 4 -/* 9C7944 80242564 8E050000 */ lw $a1, ($s0) -/* 9C7948 80242568 26100004 */ addiu $s0, $s0, 4 -/* 9C794C 8024256C 0C0B210B */ jal get_float_variable -/* 9C7950 80242570 0240202D */ daddu $a0, $s2, $zero -/* 9C7954 80242574 8E050000 */ lw $a1, ($s0) -/* 9C7958 80242578 26100004 */ addiu $s0, $s0, 4 -/* 9C795C 8024257C 0240202D */ daddu $a0, $s2, $zero -/* 9C7960 80242580 0C0B210B */ jal get_float_variable -/* 9C7964 80242584 46000606 */ mov.s $f24, $f0 -/* 9C7968 80242588 8E050000 */ lw $a1, ($s0) -/* 9C796C 8024258C 26100004 */ addiu $s0, $s0, 4 -/* 9C7970 80242590 0240202D */ daddu $a0, $s2, $zero -/* 9C7974 80242594 0C0B1EAF */ jal get_variable -/* 9C7978 80242598 46000506 */ mov.s $f20, $f0 -/* 9C797C 8024259C 8E050000 */ lw $a1, ($s0) -/* 9C7980 802425A0 26100004 */ addiu $s0, $s0, 4 -/* 9C7984 802425A4 0240202D */ daddu $a0, $s2, $zero -/* 9C7988 802425A8 0C0B1EAF */ jal get_variable -/* 9C798C 802425AC 0040882D */ daddu $s1, $v0, $zero -/* 9C7990 802425B0 0240202D */ daddu $a0, $s2, $zero -/* 9C7994 802425B4 8E050000 */ lw $a1, ($s0) -/* 9C7998 802425B8 0C0B210B */ jal get_float_variable -/* 9C799C 802425BC 0040802D */ daddu $s0, $v0, $zero -/* 9C79A0 802425C0 3C014334 */ lui $at, 0x4334 -/* 9C79A4 802425C4 44811000 */ mtc1 $at, $f2 -/* 9C79A8 802425C8 3C014049 */ lui $at, 0x4049 -/* 9C79AC 802425CC 34210FD8 */ ori $at, $at, 0xfd8 -/* 9C79B0 802425D0 44812000 */ mtc1 $at, $f4 -/* 9C79B4 802425D4 46020003 */ div.s $f0, $f0, $f2 -/* 9C79B8 802425D8 46040582 */ mul.s $f22, $f0, $f4 -/* 9C79BC 802425DC 00000000 */ nop -/* 9C79C0 802425E0 4618A501 */ sub.s $f20, $f20, $f24 -/* 9C79C4 802425E4 3C013F00 */ lui $at, 0x3f00 -/* 9C79C8 802425E8 44810000 */ mtc1 $at, $f0 -/* 9C79CC 802425EC 00000000 */ nop -/* 9C79D0 802425F0 4600A502 */ mul.s $f20, $f20, $f0 -/* 9C79D4 802425F4 00000000 */ nop -/* 9C79D8 802425F8 12000007 */ beqz $s0, .L80242618 -/* 9C79DC 802425FC 0233102A */ slt $v0, $s1, $s3 -/* 9C79E0 80242600 10400005 */ beqz $v0, .L80242618 -/* 9C79E4 80242604 0240202D */ daddu $a0, $s2, $zero -/* 9C79E8 80242608 0220982D */ daddu $s3, $s1, $zero -/* 9C79EC 8024260C 0280282D */ daddu $a1, $s4, $zero -/* 9C79F0 80242610 0C0B2026 */ jal set_variable -/* 9C79F4 80242614 0220302D */ daddu $a2, $s1, $zero -.L80242618: -/* 9C79F8 80242618 3C014049 */ lui $at, 0x4049 -/* 9C79FC 8024261C 34210FD8 */ ori $at, $at, 0xfd8 -/* 9C7A00 80242620 44810000 */ mtc1 $at, $f0 -/* 9C7A04 80242624 44936000 */ mtc1 $s3, $f12 -/* 9C7A08 80242628 00000000 */ nop -/* 9C7A0C 8024262C 46806320 */ cvt.s.w $f12, $f12 -/* 9C7A10 80242630 46006302 */ mul.s $f12, $f12, $f0 -/* 9C7A14 80242634 00000000 */ nop -/* 9C7A18 80242638 44910000 */ mtc1 $s1, $f0 -/* 9C7A1C 8024263C 00000000 */ nop -/* 9C7A20 80242640 46800020 */ cvt.s.w $f0, $f0 -/* 9C7A24 80242644 46006303 */ div.s $f12, $f12, $f0 -/* 9C7A28 80242648 0C00A874 */ jal cos_rad -/* 9C7A2C 8024264C 46166300 */ add.s $f12, $f12, $f22 -/* 9C7A30 80242650 4600A002 */ mul.s $f0, $f20, $f0 -/* 9C7A34 80242654 00000000 */ nop -/* 9C7A38 80242658 4614C080 */ add.s $f2, $f24, $f20 -/* 9C7A3C 8024265C 46001081 */ sub.s $f2, $f2, $f0 -/* 9C7A40 80242660 0240202D */ daddu $a0, $s2, $zero -/* 9C7A44 80242664 44061000 */ mfc1 $a2, $f2 -/* 9C7A48 80242668 0C0B2190 */ jal set_float_variable -/* 9C7A4C 8024266C 02A0282D */ daddu $a1, $s5, $zero -/* 9C7A50 80242670 8FBF0028 */ lw $ra, 0x28($sp) -/* 9C7A54 80242674 8FB50024 */ lw $s5, 0x24($sp) -/* 9C7A58 80242678 8FB40020 */ lw $s4, 0x20($sp) -/* 9C7A5C 8024267C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C7A60 80242680 8FB20018 */ lw $s2, 0x18($sp) -/* 9C7A64 80242684 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7A68 80242688 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7A6C 8024268C D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9C7A70 80242690 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9C7A74 80242694 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9C7A78 80242698 24020002 */ addiu $v0, $zero, 2 -/* 9C7A7C 8024269C 03E00008 */ jr $ra -/* 9C7A80 802426A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240184_9EDD74.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240184_9EDD74.s deleted file mode 100644 index 4199fd6fcf..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240184_9EDD74.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240184_9EDD74 -/* 9EDD74 80240184 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9EDD78 80240188 AFB20018 */ sw $s2, 0x18($sp) -/* 9EDD7C 8024018C 0080902D */ daddu $s2, $a0, $zero -/* 9EDD80 80240190 AFBF0028 */ sw $ra, 0x28($sp) -/* 9EDD84 80240194 AFB50024 */ sw $s5, 0x24($sp) -/* 9EDD88 80240198 AFB40020 */ sw $s4, 0x20($sp) -/* 9EDD8C 8024019C AFB3001C */ sw $s3, 0x1c($sp) -/* 9EDD90 802401A0 AFB10014 */ sw $s1, 0x14($sp) -/* 9EDD94 802401A4 AFB00010 */ sw $s0, 0x10($sp) -/* 9EDD98 802401A8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9EDD9C 802401AC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9EDDA0 802401B0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9EDDA4 802401B4 8E50000C */ lw $s0, 0xc($s2) -/* 9EDDA8 802401B8 8E140000 */ lw $s4, ($s0) -/* 9EDDAC 802401BC 26100004 */ addiu $s0, $s0, 4 -/* 9EDDB0 802401C0 0C0B1EAF */ jal get_variable -/* 9EDDB4 802401C4 0280282D */ daddu $a1, $s4, $zero -/* 9EDDB8 802401C8 0040982D */ daddu $s3, $v0, $zero -/* 9EDDBC 802401CC 8E150000 */ lw $s5, ($s0) -/* 9EDDC0 802401D0 26100004 */ addiu $s0, $s0, 4 -/* 9EDDC4 802401D4 8E050000 */ lw $a1, ($s0) -/* 9EDDC8 802401D8 26100004 */ addiu $s0, $s0, 4 -/* 9EDDCC 802401DC 0C0B210B */ jal get_float_variable -/* 9EDDD0 802401E0 0240202D */ daddu $a0, $s2, $zero -/* 9EDDD4 802401E4 8E050000 */ lw $a1, ($s0) -/* 9EDDD8 802401E8 26100004 */ addiu $s0, $s0, 4 -/* 9EDDDC 802401EC 0240202D */ daddu $a0, $s2, $zero -/* 9EDDE0 802401F0 0C0B210B */ jal get_float_variable -/* 9EDDE4 802401F4 46000606 */ mov.s $f24, $f0 -/* 9EDDE8 802401F8 8E050000 */ lw $a1, ($s0) -/* 9EDDEC 802401FC 26100004 */ addiu $s0, $s0, 4 -/* 9EDDF0 80240200 0240202D */ daddu $a0, $s2, $zero -/* 9EDDF4 80240204 0C0B1EAF */ jal get_variable -/* 9EDDF8 80240208 46000506 */ mov.s $f20, $f0 -/* 9EDDFC 8024020C 8E050000 */ lw $a1, ($s0) -/* 9EDE00 80240210 26100004 */ addiu $s0, $s0, 4 -/* 9EDE04 80240214 0240202D */ daddu $a0, $s2, $zero -/* 9EDE08 80240218 0C0B1EAF */ jal get_variable -/* 9EDE0C 8024021C 0040882D */ daddu $s1, $v0, $zero -/* 9EDE10 80240220 0240202D */ daddu $a0, $s2, $zero -/* 9EDE14 80240224 8E050000 */ lw $a1, ($s0) -/* 9EDE18 80240228 0C0B210B */ jal get_float_variable -/* 9EDE1C 8024022C 0040802D */ daddu $s0, $v0, $zero -/* 9EDE20 80240230 3C014334 */ lui $at, 0x4334 -/* 9EDE24 80240234 44811000 */ mtc1 $at, $f2 -/* 9EDE28 80240238 3C014049 */ lui $at, 0x4049 -/* 9EDE2C 8024023C 34210FD8 */ ori $at, $at, 0xfd8 -/* 9EDE30 80240240 44812000 */ mtc1 $at, $f4 -/* 9EDE34 80240244 46020003 */ div.s $f0, $f0, $f2 -/* 9EDE38 80240248 46040582 */ mul.s $f22, $f0, $f4 -/* 9EDE3C 8024024C 00000000 */ nop -/* 9EDE40 80240250 4618A501 */ sub.s $f20, $f20, $f24 -/* 9EDE44 80240254 3C013F00 */ lui $at, 0x3f00 -/* 9EDE48 80240258 44810000 */ mtc1 $at, $f0 -/* 9EDE4C 8024025C 00000000 */ nop -/* 9EDE50 80240260 4600A502 */ mul.s $f20, $f20, $f0 -/* 9EDE54 80240264 00000000 */ nop -/* 9EDE58 80240268 12000007 */ beqz $s0, .L80240288 -/* 9EDE5C 8024026C 0233102A */ slt $v0, $s1, $s3 -/* 9EDE60 80240270 10400005 */ beqz $v0, .L80240288 -/* 9EDE64 80240274 0240202D */ daddu $a0, $s2, $zero -/* 9EDE68 80240278 0220982D */ daddu $s3, $s1, $zero -/* 9EDE6C 8024027C 0280282D */ daddu $a1, $s4, $zero -/* 9EDE70 80240280 0C0B2026 */ jal set_variable -/* 9EDE74 80240284 0220302D */ daddu $a2, $s1, $zero -.L80240288: -/* 9EDE78 80240288 3C014049 */ lui $at, 0x4049 -/* 9EDE7C 8024028C 34210FD8 */ ori $at, $at, 0xfd8 -/* 9EDE80 80240290 44810000 */ mtc1 $at, $f0 -/* 9EDE84 80240294 44936000 */ mtc1 $s3, $f12 -/* 9EDE88 80240298 00000000 */ nop -/* 9EDE8C 8024029C 46806320 */ cvt.s.w $f12, $f12 -/* 9EDE90 802402A0 46006302 */ mul.s $f12, $f12, $f0 -/* 9EDE94 802402A4 00000000 */ nop -/* 9EDE98 802402A8 44910000 */ mtc1 $s1, $f0 -/* 9EDE9C 802402AC 00000000 */ nop -/* 9EDEA0 802402B0 46800020 */ cvt.s.w $f0, $f0 -/* 9EDEA4 802402B4 46006303 */ div.s $f12, $f12, $f0 -/* 9EDEA8 802402B8 0C00A874 */ jal cos_rad -/* 9EDEAC 802402BC 46166300 */ add.s $f12, $f12, $f22 -/* 9EDEB0 802402C0 4600A002 */ mul.s $f0, $f20, $f0 -/* 9EDEB4 802402C4 00000000 */ nop -/* 9EDEB8 802402C8 4614C080 */ add.s $f2, $f24, $f20 -/* 9EDEBC 802402CC 46001081 */ sub.s $f2, $f2, $f0 -/* 9EDEC0 802402D0 0240202D */ daddu $a0, $s2, $zero -/* 9EDEC4 802402D4 44061000 */ mfc1 $a2, $f2 -/* 9EDEC8 802402D8 0C0B2190 */ jal set_float_variable -/* 9EDECC 802402DC 02A0282D */ daddu $a1, $s5, $zero -/* 9EDED0 802402E0 8FBF0028 */ lw $ra, 0x28($sp) -/* 9EDED4 802402E4 8FB50024 */ lw $s5, 0x24($sp) -/* 9EDED8 802402E8 8FB40020 */ lw $s4, 0x20($sp) -/* 9EDEDC 802402EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9EDEE0 802402F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9EDEE4 802402F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9EDEE8 802402F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9EDEEC 802402FC D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9EDEF0 80240300 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9EDEF4 80240304 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9EDEF8 80240308 24020002 */ addiu $v0, $zero, 2 -/* 9EDEFC 8024030C 03E00008 */ jr $ra -/* 9EDF00 80240310 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802403A8_DA55E8.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802403A8_DA55E8.s deleted file mode 100644 index 87f7dc6387..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802403A8_DA55E8.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A8_DA55E8 -/* DA55E8 802403A8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DA55EC 802403AC AFB20018 */ sw $s2, 0x18($sp) -/* DA55F0 802403B0 0080902D */ daddu $s2, $a0, $zero -/* DA55F4 802403B4 AFBF0028 */ sw $ra, 0x28($sp) -/* DA55F8 802403B8 AFB50024 */ sw $s5, 0x24($sp) -/* DA55FC 802403BC AFB40020 */ sw $s4, 0x20($sp) -/* DA5600 802403C0 AFB3001C */ sw $s3, 0x1c($sp) -/* DA5604 802403C4 AFB10014 */ sw $s1, 0x14($sp) -/* DA5608 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* DA560C 802403CC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DA5610 802403D0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DA5614 802403D4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DA5618 802403D8 8E50000C */ lw $s0, 0xc($s2) -/* DA561C 802403DC 8E140000 */ lw $s4, ($s0) -/* DA5620 802403E0 26100004 */ addiu $s0, $s0, 4 -/* DA5624 802403E4 0C0B1EAF */ jal get_variable -/* DA5628 802403E8 0280282D */ daddu $a1, $s4, $zero -/* DA562C 802403EC 0040982D */ daddu $s3, $v0, $zero -/* DA5630 802403F0 8E150000 */ lw $s5, ($s0) -/* DA5634 802403F4 26100004 */ addiu $s0, $s0, 4 -/* DA5638 802403F8 8E050000 */ lw $a1, ($s0) -/* DA563C 802403FC 26100004 */ addiu $s0, $s0, 4 -/* DA5640 80240400 0C0B210B */ jal get_float_variable -/* DA5644 80240404 0240202D */ daddu $a0, $s2, $zero -/* DA5648 80240408 8E050000 */ lw $a1, ($s0) -/* DA564C 8024040C 26100004 */ addiu $s0, $s0, 4 -/* DA5650 80240410 0240202D */ daddu $a0, $s2, $zero -/* DA5654 80240414 0C0B210B */ jal get_float_variable -/* DA5658 80240418 46000606 */ mov.s $f24, $f0 -/* DA565C 8024041C 8E050000 */ lw $a1, ($s0) -/* DA5660 80240420 26100004 */ addiu $s0, $s0, 4 -/* DA5664 80240424 0240202D */ daddu $a0, $s2, $zero -/* DA5668 80240428 0C0B1EAF */ jal get_variable -/* DA566C 8024042C 46000506 */ mov.s $f20, $f0 -/* DA5670 80240430 8E050000 */ lw $a1, ($s0) -/* DA5674 80240434 26100004 */ addiu $s0, $s0, 4 -/* DA5678 80240438 0240202D */ daddu $a0, $s2, $zero -/* DA567C 8024043C 0C0B1EAF */ jal get_variable -/* DA5680 80240440 0040882D */ daddu $s1, $v0, $zero -/* DA5684 80240444 0240202D */ daddu $a0, $s2, $zero -/* DA5688 80240448 8E050000 */ lw $a1, ($s0) -/* DA568C 8024044C 0C0B210B */ jal get_float_variable -/* DA5690 80240450 0040802D */ daddu $s0, $v0, $zero -/* DA5694 80240454 3C014334 */ lui $at, 0x4334 -/* DA5698 80240458 44811000 */ mtc1 $at, $f2 -/* DA569C 8024045C 3C014049 */ lui $at, 0x4049 -/* DA56A0 80240460 34210FD8 */ ori $at, $at, 0xfd8 -/* DA56A4 80240464 44812000 */ mtc1 $at, $f4 -/* DA56A8 80240468 46020003 */ div.s $f0, $f0, $f2 -/* DA56AC 8024046C 46040582 */ mul.s $f22, $f0, $f4 -/* DA56B0 80240470 00000000 */ nop -/* DA56B4 80240474 4618A501 */ sub.s $f20, $f20, $f24 -/* DA56B8 80240478 3C013F00 */ lui $at, 0x3f00 -/* DA56BC 8024047C 44810000 */ mtc1 $at, $f0 -/* DA56C0 80240480 00000000 */ nop -/* DA56C4 80240484 4600A502 */ mul.s $f20, $f20, $f0 -/* DA56C8 80240488 00000000 */ nop -/* DA56CC 8024048C 12000007 */ beqz $s0, .L802404AC -/* DA56D0 80240490 0233102A */ slt $v0, $s1, $s3 -/* DA56D4 80240494 10400005 */ beqz $v0, .L802404AC -/* DA56D8 80240498 0240202D */ daddu $a0, $s2, $zero -/* DA56DC 8024049C 0220982D */ daddu $s3, $s1, $zero -/* DA56E0 802404A0 0280282D */ daddu $a1, $s4, $zero -/* DA56E4 802404A4 0C0B2026 */ jal set_variable -/* DA56E8 802404A8 0220302D */ daddu $a2, $s1, $zero -.L802404AC: -/* DA56EC 802404AC 3C014049 */ lui $at, 0x4049 -/* DA56F0 802404B0 34210FD8 */ ori $at, $at, 0xfd8 -/* DA56F4 802404B4 44810000 */ mtc1 $at, $f0 -/* DA56F8 802404B8 44936000 */ mtc1 $s3, $f12 -/* DA56FC 802404BC 00000000 */ nop -/* DA5700 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* DA5704 802404C4 46006302 */ mul.s $f12, $f12, $f0 -/* DA5708 802404C8 00000000 */ nop -/* DA570C 802404CC 44910000 */ mtc1 $s1, $f0 -/* DA5710 802404D0 00000000 */ nop -/* DA5714 802404D4 46800020 */ cvt.s.w $f0, $f0 -/* DA5718 802404D8 46006303 */ div.s $f12, $f12, $f0 -/* DA571C 802404DC 0C00A874 */ jal cos_rad -/* DA5720 802404E0 46166300 */ add.s $f12, $f12, $f22 -/* DA5724 802404E4 4600A002 */ mul.s $f0, $f20, $f0 -/* DA5728 802404E8 00000000 */ nop -/* DA572C 802404EC 4614C080 */ add.s $f2, $f24, $f20 -/* DA5730 802404F0 46001081 */ sub.s $f2, $f2, $f0 -/* DA5734 802404F4 0240202D */ daddu $a0, $s2, $zero -/* DA5738 802404F8 44061000 */ mfc1 $a2, $f2 -/* DA573C 802404FC 0C0B2190 */ jal set_float_variable -/* DA5740 80240500 02A0282D */ daddu $a1, $s5, $zero -/* DA5744 80240504 8FBF0028 */ lw $ra, 0x28($sp) -/* DA5748 80240508 8FB50024 */ lw $s5, 0x24($sp) -/* DA574C 8024050C 8FB40020 */ lw $s4, 0x20($sp) -/* DA5750 80240510 8FB3001C */ lw $s3, 0x1c($sp) -/* DA5754 80240514 8FB20018 */ lw $s2, 0x18($sp) -/* DA5758 80240518 8FB10014 */ lw $s1, 0x14($sp) -/* DA575C 8024051C 8FB00010 */ lw $s0, 0x10($sp) -/* DA5760 80240520 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DA5764 80240524 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DA5768 80240528 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DA576C 8024052C 24020002 */ addiu $v0, $zero, 2 -/* DA5770 80240530 03E00008 */ jr $ra -/* DA5774 80240534 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240388_DB7C98.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240388_DB7C98.s deleted file mode 100644 index 202bd0e10a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240388_DB7C98.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DB7C98 -/* DB7C98 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DB7C9C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DB7CA0 80240390 0080902D */ daddu $s2, $a0, $zero -/* DB7CA4 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DB7CA8 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DB7CAC 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DB7CB0 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DB7CB4 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DB7CB8 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DB7CBC 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DB7CC0 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DB7CC4 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DB7CC8 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DB7CCC 802403BC 8E140000 */ lw $s4, ($s0) -/* DB7CD0 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DB7CD4 802403C4 0C0B1EAF */ jal get_variable -/* DB7CD8 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DB7CDC 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DB7CE0 802403D0 8E150000 */ lw $s5, ($s0) -/* DB7CE4 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DB7CE8 802403D8 8E050000 */ lw $a1, ($s0) -/* DB7CEC 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DB7CF0 802403E0 0C0B210B */ jal get_float_variable -/* DB7CF4 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DB7CF8 802403E8 8E050000 */ lw $a1, ($s0) -/* DB7CFC 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DB7D00 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DB7D04 802403F4 0C0B210B */ jal get_float_variable -/* DB7D08 802403F8 46000606 */ mov.s $f24, $f0 -/* DB7D0C 802403FC 8E050000 */ lw $a1, ($s0) -/* DB7D10 80240400 26100004 */ addiu $s0, $s0, 4 -/* DB7D14 80240404 0240202D */ daddu $a0, $s2, $zero -/* DB7D18 80240408 0C0B1EAF */ jal get_variable -/* DB7D1C 8024040C 46000506 */ mov.s $f20, $f0 -/* DB7D20 80240410 8E050000 */ lw $a1, ($s0) -/* DB7D24 80240414 26100004 */ addiu $s0, $s0, 4 -/* DB7D28 80240418 0240202D */ daddu $a0, $s2, $zero -/* DB7D2C 8024041C 0C0B1EAF */ jal get_variable -/* DB7D30 80240420 0040882D */ daddu $s1, $v0, $zero -/* DB7D34 80240424 0240202D */ daddu $a0, $s2, $zero -/* DB7D38 80240428 8E050000 */ lw $a1, ($s0) -/* DB7D3C 8024042C 0C0B210B */ jal get_float_variable -/* DB7D40 80240430 0040802D */ daddu $s0, $v0, $zero -/* DB7D44 80240434 3C014334 */ lui $at, 0x4334 -/* DB7D48 80240438 44811000 */ mtc1 $at, $f2 -/* DB7D4C 8024043C 3C014049 */ lui $at, 0x4049 -/* DB7D50 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DB7D54 80240444 44812000 */ mtc1 $at, $f4 -/* DB7D58 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DB7D5C 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DB7D60 80240450 00000000 */ nop -/* DB7D64 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DB7D68 80240458 3C013F00 */ lui $at, 0x3f00 -/* DB7D6C 8024045C 44810000 */ mtc1 $at, $f0 -/* DB7D70 80240460 00000000 */ nop -/* DB7D74 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DB7D78 80240468 00000000 */ nop -/* DB7D7C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DB7D80 80240470 0233102A */ slt $v0, $s1, $s3 -/* DB7D84 80240474 10400005 */ beqz $v0, .L8024048C -/* DB7D88 80240478 0240202D */ daddu $a0, $s2, $zero -/* DB7D8C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DB7D90 80240480 0280282D */ daddu $a1, $s4, $zero -/* DB7D94 80240484 0C0B2026 */ jal set_variable -/* DB7D98 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DB7D9C 8024048C 3C014049 */ lui $at, 0x4049 -/* DB7DA0 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DB7DA4 80240494 44810000 */ mtc1 $at, $f0 -/* DB7DA8 80240498 44936000 */ mtc1 $s3, $f12 -/* DB7DAC 8024049C 00000000 */ nop -/* DB7DB0 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DB7DB4 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DB7DB8 802404A8 00000000 */ nop -/* DB7DBC 802404AC 44910000 */ mtc1 $s1, $f0 -/* DB7DC0 802404B0 00000000 */ nop -/* DB7DC4 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DB7DC8 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DB7DCC 802404BC 0C00A874 */ jal cos_rad -/* DB7DD0 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DB7DD4 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DB7DD8 802404C8 00000000 */ nop -/* DB7DDC 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DB7DE0 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DB7DE4 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DB7DE8 802404D8 44061000 */ mfc1 $a2, $f2 -/* DB7DEC 802404DC 0C0B2190 */ jal set_float_variable -/* DB7DF0 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DB7DF4 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DB7DF8 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DB7DFC 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DB7E00 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DB7E04 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DB7E08 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DB7E0C 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DB7E10 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DB7E14 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DB7E18 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DB7E1C 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DB7E20 80240510 03E00008 */ jr $ra -/* DB7E24 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240388_DC4758.s b/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240388_DC4758.s deleted file mode 100644 index a13f095845..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240388_DC4758.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DC4758 -/* DC4758 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DC475C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DC4760 80240390 0080902D */ daddu $s2, $a0, $zero -/* DC4764 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DC4768 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DC476C 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DC4770 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DC4774 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DC4778 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DC477C 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DC4780 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DC4784 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DC4788 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DC478C 802403BC 8E140000 */ lw $s4, ($s0) -/* DC4790 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DC4794 802403C4 0C0B1EAF */ jal get_variable -/* DC4798 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DC479C 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DC47A0 802403D0 8E150000 */ lw $s5, ($s0) -/* DC47A4 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DC47A8 802403D8 8E050000 */ lw $a1, ($s0) -/* DC47AC 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DC47B0 802403E0 0C0B210B */ jal get_float_variable -/* DC47B4 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DC47B8 802403E8 8E050000 */ lw $a1, ($s0) -/* DC47BC 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DC47C0 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DC47C4 802403F4 0C0B210B */ jal get_float_variable -/* DC47C8 802403F8 46000606 */ mov.s $f24, $f0 -/* DC47CC 802403FC 8E050000 */ lw $a1, ($s0) -/* DC47D0 80240400 26100004 */ addiu $s0, $s0, 4 -/* DC47D4 80240404 0240202D */ daddu $a0, $s2, $zero -/* DC47D8 80240408 0C0B1EAF */ jal get_variable -/* DC47DC 8024040C 46000506 */ mov.s $f20, $f0 -/* DC47E0 80240410 8E050000 */ lw $a1, ($s0) -/* DC47E4 80240414 26100004 */ addiu $s0, $s0, 4 -/* DC47E8 80240418 0240202D */ daddu $a0, $s2, $zero -/* DC47EC 8024041C 0C0B1EAF */ jal get_variable -/* DC47F0 80240420 0040882D */ daddu $s1, $v0, $zero -/* DC47F4 80240424 0240202D */ daddu $a0, $s2, $zero -/* DC47F8 80240428 8E050000 */ lw $a1, ($s0) -/* DC47FC 8024042C 0C0B210B */ jal get_float_variable -/* DC4800 80240430 0040802D */ daddu $s0, $v0, $zero -/* DC4804 80240434 3C014334 */ lui $at, 0x4334 -/* DC4808 80240438 44811000 */ mtc1 $at, $f2 -/* DC480C 8024043C 3C014049 */ lui $at, 0x4049 -/* DC4810 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DC4814 80240444 44812000 */ mtc1 $at, $f4 -/* DC4818 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DC481C 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DC4820 80240450 00000000 */ nop -/* DC4824 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DC4828 80240458 3C013F00 */ lui $at, 0x3f00 -/* DC482C 8024045C 44810000 */ mtc1 $at, $f0 -/* DC4830 80240460 00000000 */ nop -/* DC4834 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DC4838 80240468 00000000 */ nop -/* DC483C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DC4840 80240470 0233102A */ slt $v0, $s1, $s3 -/* DC4844 80240474 10400005 */ beqz $v0, .L8024048C -/* DC4848 80240478 0240202D */ daddu $a0, $s2, $zero -/* DC484C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DC4850 80240480 0280282D */ daddu $a1, $s4, $zero -/* DC4854 80240484 0C0B2026 */ jal set_variable -/* DC4858 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DC485C 8024048C 3C014049 */ lui $at, 0x4049 -/* DC4860 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DC4864 80240494 44810000 */ mtc1 $at, $f0 -/* DC4868 80240498 44936000 */ mtc1 $s3, $f12 -/* DC486C 8024049C 00000000 */ nop -/* DC4870 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DC4874 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DC4878 802404A8 00000000 */ nop -/* DC487C 802404AC 44910000 */ mtc1 $s1, $f0 -/* DC4880 802404B0 00000000 */ nop -/* DC4884 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DC4888 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DC488C 802404BC 0C00A874 */ jal cos_rad -/* DC4890 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DC4894 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DC4898 802404C8 00000000 */ nop -/* DC489C 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DC48A0 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DC48A4 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DC48A8 802404D8 44061000 */ mfc1 $a2, $f2 -/* DC48AC 802404DC 0C0B2190 */ jal set_float_variable -/* DC48B0 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DC48B4 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DC48B8 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DC48BC 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DC48C0 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DC48C4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DC48C8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DC48CC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DC48D0 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DC48D4 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DC48D8 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DC48DC 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DC48E0 80240510 03E00008 */ jr $ra -/* DC48E4 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240388_DD7D38.s b/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240388_DD7D38.s deleted file mode 100644 index 71c513ed52..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240388_DD7D38.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DD7D38 -/* DD7D38 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DD7D3C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DD7D40 80240390 0080902D */ daddu $s2, $a0, $zero -/* DD7D44 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DD7D48 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DD7D4C 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DD7D50 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DD7D54 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DD7D58 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DD7D5C 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DD7D60 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DD7D64 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DD7D68 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DD7D6C 802403BC 8E140000 */ lw $s4, ($s0) -/* DD7D70 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DD7D74 802403C4 0C0B1EAF */ jal get_variable -/* DD7D78 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DD7D7C 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DD7D80 802403D0 8E150000 */ lw $s5, ($s0) -/* DD7D84 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DD7D88 802403D8 8E050000 */ lw $a1, ($s0) -/* DD7D8C 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DD7D90 802403E0 0C0B210B */ jal get_float_variable -/* DD7D94 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DD7D98 802403E8 8E050000 */ lw $a1, ($s0) -/* DD7D9C 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DD7DA0 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DD7DA4 802403F4 0C0B210B */ jal get_float_variable -/* DD7DA8 802403F8 46000606 */ mov.s $f24, $f0 -/* DD7DAC 802403FC 8E050000 */ lw $a1, ($s0) -/* DD7DB0 80240400 26100004 */ addiu $s0, $s0, 4 -/* DD7DB4 80240404 0240202D */ daddu $a0, $s2, $zero -/* DD7DB8 80240408 0C0B1EAF */ jal get_variable -/* DD7DBC 8024040C 46000506 */ mov.s $f20, $f0 -/* DD7DC0 80240410 8E050000 */ lw $a1, ($s0) -/* DD7DC4 80240414 26100004 */ addiu $s0, $s0, 4 -/* DD7DC8 80240418 0240202D */ daddu $a0, $s2, $zero -/* DD7DCC 8024041C 0C0B1EAF */ jal get_variable -/* DD7DD0 80240420 0040882D */ daddu $s1, $v0, $zero -/* DD7DD4 80240424 0240202D */ daddu $a0, $s2, $zero -/* DD7DD8 80240428 8E050000 */ lw $a1, ($s0) -/* DD7DDC 8024042C 0C0B210B */ jal get_float_variable -/* DD7DE0 80240430 0040802D */ daddu $s0, $v0, $zero -/* DD7DE4 80240434 3C014334 */ lui $at, 0x4334 -/* DD7DE8 80240438 44811000 */ mtc1 $at, $f2 -/* DD7DEC 8024043C 3C014049 */ lui $at, 0x4049 -/* DD7DF0 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DD7DF4 80240444 44812000 */ mtc1 $at, $f4 -/* DD7DF8 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DD7DFC 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DD7E00 80240450 00000000 */ nop -/* DD7E04 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DD7E08 80240458 3C013F00 */ lui $at, 0x3f00 -/* DD7E0C 8024045C 44810000 */ mtc1 $at, $f0 -/* DD7E10 80240460 00000000 */ nop -/* DD7E14 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DD7E18 80240468 00000000 */ nop -/* DD7E1C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DD7E20 80240470 0233102A */ slt $v0, $s1, $s3 -/* DD7E24 80240474 10400005 */ beqz $v0, .L8024048C -/* DD7E28 80240478 0240202D */ daddu $a0, $s2, $zero -/* DD7E2C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DD7E30 80240480 0280282D */ daddu $a1, $s4, $zero -/* DD7E34 80240484 0C0B2026 */ jal set_variable -/* DD7E38 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DD7E3C 8024048C 3C014049 */ lui $at, 0x4049 -/* DD7E40 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DD7E44 80240494 44810000 */ mtc1 $at, $f0 -/* DD7E48 80240498 44936000 */ mtc1 $s3, $f12 -/* DD7E4C 8024049C 00000000 */ nop -/* DD7E50 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DD7E54 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DD7E58 802404A8 00000000 */ nop -/* DD7E5C 802404AC 44910000 */ mtc1 $s1, $f0 -/* DD7E60 802404B0 00000000 */ nop -/* DD7E64 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DD7E68 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DD7E6C 802404BC 0C00A874 */ jal cos_rad -/* DD7E70 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DD7E74 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DD7E78 802404C8 00000000 */ nop -/* DD7E7C 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DD7E80 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DD7E84 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DD7E88 802404D8 44061000 */ mfc1 $a2, $f2 -/* DD7E8C 802404DC 0C0B2190 */ jal set_float_variable -/* DD7E90 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DD7E94 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DD7E98 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DD7E9C 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DD7EA0 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DD7EA4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DD7EA8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DD7EAC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DD7EB0 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DD7EB4 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DD7EB8 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DD7EBC 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DD7EC0 80240510 03E00008 */ jr $ra -/* DD7EC4 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240388_DEC258.s b/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240388_DEC258.s deleted file mode 100644 index 9b76b2a61b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240388_DEC258.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DEC258 -/* DEC258 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DEC25C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DEC260 80240390 0080902D */ daddu $s2, $a0, $zero -/* DEC264 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DEC268 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DEC26C 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DEC270 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DEC274 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DEC278 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DEC27C 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DEC280 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DEC284 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DEC288 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DEC28C 802403BC 8E140000 */ lw $s4, ($s0) -/* DEC290 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DEC294 802403C4 0C0B1EAF */ jal get_variable -/* DEC298 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DEC29C 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DEC2A0 802403D0 8E150000 */ lw $s5, ($s0) -/* DEC2A4 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DEC2A8 802403D8 8E050000 */ lw $a1, ($s0) -/* DEC2AC 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DEC2B0 802403E0 0C0B210B */ jal get_float_variable -/* DEC2B4 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DEC2B8 802403E8 8E050000 */ lw $a1, ($s0) -/* DEC2BC 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DEC2C0 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DEC2C4 802403F4 0C0B210B */ jal get_float_variable -/* DEC2C8 802403F8 46000606 */ mov.s $f24, $f0 -/* DEC2CC 802403FC 8E050000 */ lw $a1, ($s0) -/* DEC2D0 80240400 26100004 */ addiu $s0, $s0, 4 -/* DEC2D4 80240404 0240202D */ daddu $a0, $s2, $zero -/* DEC2D8 80240408 0C0B1EAF */ jal get_variable -/* DEC2DC 8024040C 46000506 */ mov.s $f20, $f0 -/* DEC2E0 80240410 8E050000 */ lw $a1, ($s0) -/* DEC2E4 80240414 26100004 */ addiu $s0, $s0, 4 -/* DEC2E8 80240418 0240202D */ daddu $a0, $s2, $zero -/* DEC2EC 8024041C 0C0B1EAF */ jal get_variable -/* DEC2F0 80240420 0040882D */ daddu $s1, $v0, $zero -/* DEC2F4 80240424 0240202D */ daddu $a0, $s2, $zero -/* DEC2F8 80240428 8E050000 */ lw $a1, ($s0) -/* DEC2FC 8024042C 0C0B210B */ jal get_float_variable -/* DEC300 80240430 0040802D */ daddu $s0, $v0, $zero -/* DEC304 80240434 3C014334 */ lui $at, 0x4334 -/* DEC308 80240438 44811000 */ mtc1 $at, $f2 -/* DEC30C 8024043C 3C014049 */ lui $at, 0x4049 -/* DEC310 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DEC314 80240444 44812000 */ mtc1 $at, $f4 -/* DEC318 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DEC31C 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DEC320 80240450 00000000 */ nop -/* DEC324 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DEC328 80240458 3C013F00 */ lui $at, 0x3f00 -/* DEC32C 8024045C 44810000 */ mtc1 $at, $f0 -/* DEC330 80240460 00000000 */ nop -/* DEC334 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DEC338 80240468 00000000 */ nop -/* DEC33C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DEC340 80240470 0233102A */ slt $v0, $s1, $s3 -/* DEC344 80240474 10400005 */ beqz $v0, .L8024048C -/* DEC348 80240478 0240202D */ daddu $a0, $s2, $zero -/* DEC34C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DEC350 80240480 0280282D */ daddu $a1, $s4, $zero -/* DEC354 80240484 0C0B2026 */ jal set_variable -/* DEC358 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DEC35C 8024048C 3C014049 */ lui $at, 0x4049 -/* DEC360 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DEC364 80240494 44810000 */ mtc1 $at, $f0 -/* DEC368 80240498 44936000 */ mtc1 $s3, $f12 -/* DEC36C 8024049C 00000000 */ nop -/* DEC370 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DEC374 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DEC378 802404A8 00000000 */ nop -/* DEC37C 802404AC 44910000 */ mtc1 $s1, $f0 -/* DEC380 802404B0 00000000 */ nop -/* DEC384 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DEC388 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DEC38C 802404BC 0C00A874 */ jal cos_rad -/* DEC390 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DEC394 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DEC398 802404C8 00000000 */ nop -/* DEC39C 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DEC3A0 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DEC3A4 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DEC3A8 802404D8 44061000 */ mfc1 $a2, $f2 -/* DEC3AC 802404DC 0C0B2190 */ jal set_float_variable -/* DEC3B0 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DEC3B4 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DEC3B8 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DEC3BC 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DEC3C0 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DEC3C4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DEC3C8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DEC3CC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DEC3D0 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DEC3D4 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DEC3D8 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DEC3DC 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DEC3E0 80240510 03E00008 */ jr $ra -/* DEC3E4 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240388_DEF228.s b/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240388_DEF228.s deleted file mode 100644 index 0cc9f85d87..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240388_DEF228.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DEF228 -/* DEF228 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DEF22C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DEF230 80240390 0080902D */ daddu $s2, $a0, $zero -/* DEF234 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DEF238 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DEF23C 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DEF240 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DEF244 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DEF248 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DEF24C 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DEF250 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DEF254 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DEF258 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DEF25C 802403BC 8E140000 */ lw $s4, ($s0) -/* DEF260 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DEF264 802403C4 0C0B1EAF */ jal get_variable -/* DEF268 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DEF26C 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DEF270 802403D0 8E150000 */ lw $s5, ($s0) -/* DEF274 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DEF278 802403D8 8E050000 */ lw $a1, ($s0) -/* DEF27C 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DEF280 802403E0 0C0B210B */ jal get_float_variable -/* DEF284 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DEF288 802403E8 8E050000 */ lw $a1, ($s0) -/* DEF28C 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DEF290 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DEF294 802403F4 0C0B210B */ jal get_float_variable -/* DEF298 802403F8 46000606 */ mov.s $f24, $f0 -/* DEF29C 802403FC 8E050000 */ lw $a1, ($s0) -/* DEF2A0 80240400 26100004 */ addiu $s0, $s0, 4 -/* DEF2A4 80240404 0240202D */ daddu $a0, $s2, $zero -/* DEF2A8 80240408 0C0B1EAF */ jal get_variable -/* DEF2AC 8024040C 46000506 */ mov.s $f20, $f0 -/* DEF2B0 80240410 8E050000 */ lw $a1, ($s0) -/* DEF2B4 80240414 26100004 */ addiu $s0, $s0, 4 -/* DEF2B8 80240418 0240202D */ daddu $a0, $s2, $zero -/* DEF2BC 8024041C 0C0B1EAF */ jal get_variable -/* DEF2C0 80240420 0040882D */ daddu $s1, $v0, $zero -/* DEF2C4 80240424 0240202D */ daddu $a0, $s2, $zero -/* DEF2C8 80240428 8E050000 */ lw $a1, ($s0) -/* DEF2CC 8024042C 0C0B210B */ jal get_float_variable -/* DEF2D0 80240430 0040802D */ daddu $s0, $v0, $zero -/* DEF2D4 80240434 3C014334 */ lui $at, 0x4334 -/* DEF2D8 80240438 44811000 */ mtc1 $at, $f2 -/* DEF2DC 8024043C 3C014049 */ lui $at, 0x4049 -/* DEF2E0 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DEF2E4 80240444 44812000 */ mtc1 $at, $f4 -/* DEF2E8 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DEF2EC 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DEF2F0 80240450 00000000 */ nop -/* DEF2F4 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DEF2F8 80240458 3C013F00 */ lui $at, 0x3f00 -/* DEF2FC 8024045C 44810000 */ mtc1 $at, $f0 -/* DEF300 80240460 00000000 */ nop -/* DEF304 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DEF308 80240468 00000000 */ nop -/* DEF30C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DEF310 80240470 0233102A */ slt $v0, $s1, $s3 -/* DEF314 80240474 10400005 */ beqz $v0, .L8024048C -/* DEF318 80240478 0240202D */ daddu $a0, $s2, $zero -/* DEF31C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DEF320 80240480 0280282D */ daddu $a1, $s4, $zero -/* DEF324 80240484 0C0B2026 */ jal set_variable -/* DEF328 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DEF32C 8024048C 3C014049 */ lui $at, 0x4049 -/* DEF330 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DEF334 80240494 44810000 */ mtc1 $at, $f0 -/* DEF338 80240498 44936000 */ mtc1 $s3, $f12 -/* DEF33C 8024049C 00000000 */ nop -/* DEF340 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DEF344 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DEF348 802404A8 00000000 */ nop -/* DEF34C 802404AC 44910000 */ mtc1 $s1, $f0 -/* DEF350 802404B0 00000000 */ nop -/* DEF354 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DEF358 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DEF35C 802404BC 0C00A874 */ jal cos_rad -/* DEF360 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DEF364 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DEF368 802404C8 00000000 */ nop -/* DEF36C 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DEF370 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DEF374 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DEF378 802404D8 44061000 */ mfc1 $a2, $f2 -/* DEF37C 802404DC 0C0B2190 */ jal set_float_variable -/* DEF380 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DEF384 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DEF388 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DEF38C 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DEF390 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DEF394 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DEF398 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DEF39C 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DEF3A0 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DEF3A4 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DEF3A8 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DEF3AC 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DEF3B0 80240510 03E00008 */ jr $ra -/* DEF3B4 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/src/battle/area_flo/5B16A0.c b/src/battle/area_flo/5B16A0.c index 79ae449679..21126c2120 100644 --- a/src/battle/area_flo/5B16A0.c +++ b/src/battle/area_flo/5B16A0.c @@ -2,7 +2,7 @@ #define NAMESPACE b_area_flo -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802181F0_5B16A0); +#include "common/UnkFloatFunc.inc.c" #define NAMESPACE dup_b_area_flo #include "common/UnkBattleFunc1.inc.c" @@ -82,9 +82,13 @@ INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802197E0_5B2C90); INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802198A0_5B2D50); -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219960_5B2E10); +#define NAMESPACE dup_b_area_flo +#include "common/UnkFloatFunc.inc.c" +#define NAMESPACE b_area_flo -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219AF0_5B2FA0); +#define NAMESPACE dup2_b_area_flo +#include "common/UnkFloatFunc.inc.c" +#define NAMESPACE b_area_flo INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219C80_5B3130); diff --git a/src/battle/area_flo2/5CE690.c b/src/battle/area_flo2/5CE690.c index 610c1f1ee4..10007aad71 100644 --- a/src/battle/area_flo2/5CE690.c +++ b/src/battle/area_flo2/5CE690.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "battle/area_flo2/5CE690", func_80218058_5CE6E8); -INCLUDE_ASM(s32, "battle/area_flo2/5CE690", func_80218114_5CE7A4); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "battle/area_flo2/5CE690", func_802182A4_5CE934); diff --git a/src/battle/area_flo2/5CF2D0.c b/src/battle/area_flo2/5CF2D0.c index 239f00d600..4b577c875d 100644 --- a/src/battle/area_flo2/5CF2D0.c +++ b/src/battle/area_flo2/5CF2D0.c @@ -2,7 +2,9 @@ #define NAMESPACE b_area_flo2 -INCLUDE_ASM(s32, "battle/area_flo2/5CF2D0", func_80218C40_5CF2D0); +#define NAMESPACE dup_b_area_flo2 +#include "common/UnkFloatFunc.inc.c" +#define NAMESPACE b_area_flo2 INCLUDE_ASM(s32, "battle/area_flo2/5CF2D0", func_80218DD0_5CF460); @@ -18,9 +20,13 @@ INCLUDE_ASM(s32, "battle/area_flo2/5CF2D0", func_80219190_5CF820); INCLUDE_ASM(s32, "battle/area_flo2/5CF2D0", func_80219250_5CF8E0); -INCLUDE_ASM(s32, "battle/area_flo2/5CF2D0", func_80219310_5CF9A0); +#define NAMESPACE dup2_b_area_flo2 +#include "common/UnkFloatFunc.inc.c" +#define NAMESPACE b_area_flo2 -INCLUDE_ASM(s32, "battle/area_flo2/5CF2D0", func_802194A0_5CFB30); +#define NAMESPACE dup3_b_area_flo2 +#include "common/UnkFloatFunc.inc.c" +#define NAMESPACE b_area_flo2 INCLUDE_ASM(s32, "battle/area_flo2/5CF2D0", func_80219630_5CFCC0); diff --git a/src/battle/area_kpa/684C30.c b/src/battle/area_kpa/684C30.c index 5496278331..4751cf7b65 100644 --- a/src/battle/area_kpa/684C30.c +++ b/src/battle/area_kpa/684C30.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_80218200_684C30); -INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_80218358_684D88); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_802184E8_684F18); diff --git a/src/battle/area_kpa4/6CC1C0.c b/src/battle/area_kpa4/6CC1C0.c index 51fe5dfa37..98ddd6de8d 100644 --- a/src/battle/area_kpa4/6CC1C0.c +++ b/src/battle/area_kpa4/6CC1C0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "battle/area_kpa4/6CC1C0", func_80218150_6CC1C0); -INCLUDE_ASM(s32, "battle/area_kpa4/6CC1C0", func_802182A8_6CC318); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "battle/area_kpa4/6CC1C0", func_80218438_6CC4A8); diff --git a/src/battle/area_pra2/660750.c b/src/battle/area_pra2/660750.c index 5e3eea6a25..8fba7981f7 100644 --- a/src/battle/area_pra2/660750.c +++ b/src/battle/area_pra2/660750.c @@ -4,7 +4,7 @@ #include "common/StartRumbleWithParams.inc.c" -INCLUDE_ASM(s32, "battle/area_pra2/660750", func_80218058_6607A8); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "battle/area_pra2/660750", func_802181E8_660938); diff --git a/src/common/UnkFloatFunc.inc.c b/src/common/UnkFloatFunc.inc.c new file mode 100644 index 0000000000..471ba2f6d7 --- /dev/null +++ b/src/common/UnkFloatFunc.inc.c @@ -0,0 +1,24 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFloatFunc)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a1 = *args++; + s32 var0 = get_variable(script, a1); + s32 a2 = *args++; + f32 var1 = get_float_variable(script, *args++); + f32 var2 = get_float_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + s32 var4 = get_variable(script, *args++); + f32 temp = (get_float_variable(script, *args++) / 180.0f) * PI; + f32 diff = (var2 - var1) / 2; + + if (var4 != 0 && var3 < var0) { + var0 = var3; + set_variable(script, a1, var3); + } + + set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); + + return ApiStatus_DONE2; +} diff --git a/src/world/area_flo/flo_00/C9EE30.c b/src/world/area_flo/flo_00/C9EE30.c index 45f3636178..71da8f5262 100644 --- a/src/world/area_flo/flo_00/C9EE30.c +++ b/src/world/area_flo/flo_00/C9EE30.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_80240F80_C9EEA0); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802410B4_C9EFD4); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802411EC_C9F10C); +#include "common/UnkFloatFunc.inc.c" #include "world/common/SyncStatusMenu.inc.c" diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index b3e9e1c314..458a5e35f7 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -8,4 +8,4 @@ INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_8024030C_CDC9AC); INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_80240340_CDC9E0); -INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_80240394_CDCA34); +#include "common/UnkFloatFunc.inc.c" diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index 59a26e779e..85ed38f51b 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -16,4 +16,4 @@ INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_80240660_CE3D50); INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_80240784_CE3E74); -INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_802407B0_CE3EA0); +#include "common/UnkFloatFunc.inc.c" diff --git a/src/world/area_flo/flo_21/CE7240.c b/src/world/area_flo/flo_21/CE7240.c index 404d858ed5..62b5a8b739 100644 --- a/src/world/area_flo/flo_21/CE7240.c +++ b/src/world/area_flo/flo_21/CE7240.c @@ -1,5 +1,5 @@ #include "flo_21.h" -INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40_CE7240); +#include "common/UnkFloatFunc.inc.c" #include "world/common/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index 31e465b3fa..75b583d19e 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -1,6 +1,6 @@ #include "iwa_10.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240160_91E6D0); +#include "common/UnkFloatFunc.inc.c" #include "world/common/Set8009A650_40.inc.c" diff --git a/src/world/area_iwa/iwa_11/926A10.c b/src/world/area_iwa/iwa_11/926A10.c index b55dffcaf6..e8fe147bcc 100644 --- a/src/world/area_iwa/iwa_11/926A10.c +++ b/src/world/area_iwa/iwa_11/926A10.c @@ -1,6 +1,6 @@ #include "iwa_11.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_11/926A10", func_80240020_926A10); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_11/926A10", func_802401B0_926BA0); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index b5cf44a5fa..77b79a3ce0 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -1,6 +1,6 @@ #include "mac_03.h" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240320_831B20); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 17f61f0fff..87e7e2680a 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -110,7 +110,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242410_9C77F0); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024243C_9C781C); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242514_9C78F4); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802426A4_9C7A84); diff --git a/src/world/area_nok/nok_04/9EDBF0.c b/src/world/area_nok/nok_04/9EDBF0.c index 95f9d4cb91..0d06344f13 100644 --- a/src/world/area_nok/nok_04/9EDBF0.c +++ b/src/world/area_nok/nok_04/9EDBF0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240000_9EDBF0); -INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240184_9EDD74); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240314_9EDF04); diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index 091c82be2d..af160d3a38 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024020C_DA544C); INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802402B0_DA54F0); -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802403A8_DA55E8); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240538_DA5778); diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index 7450d9241d..81a0a7d177 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_802401EC_DB7AFC); INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240290_DB7BA0); -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240388_DB7C98); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240518_DB7E28); diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c index e0a48b9c0f..a5c6422748 100644 --- a/src/world/area_omo/omo_08/DC43D0.c +++ b/src/world/area_omo/omo_08/DC43D0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_802401EC_DC45BC); INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240290_DC4660); -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240388_DC4758); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240518_DC48E8); diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c index 1e90c216c8..ee057dbbf6 100644 --- a/src/world/area_omo/omo_10/DD79B0.c +++ b/src/world/area_omo/omo_10/DD79B0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_802401EC_DD7B9C); INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240290_DD7C40); -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240388_DD7D38); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240518_DD7EC8); diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c index fbf0379bef..45c400386c 100644 --- a/src/world/area_omo/omo_16/DEBED0.c +++ b/src/world/area_omo/omo_16/DEBED0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_802401EC_DEC0BC); INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_80240290_DEC160); -INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_80240388_DEC258); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_80240518_DEC3E8); diff --git a/src/world/area_omo/omo_17/DEEEA0.c b/src/world/area_omo/omo_17/DEEEA0.c index 029d1fc88f..f06db004b0 100644 --- a/src/world/area_omo/omo_17/DEEEA0.c +++ b/src/world/area_omo/omo_17/DEEEA0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_802401EC_DEF08C); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_80240290_DEF130); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_80240388_DEF228); +#include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_80240518_DEF3B8);