diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240118_C3D198.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240118_C3D198.s deleted file mode 100644 index 35475f59e3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240118_C3D198.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_C3D198 -/* C3D198 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3D19C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* C3D1A0 80240120 0080882D */ daddu $s1, $a0, $zero -/* C3D1A4 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* C3D1A8 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* C3D1AC 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* C3D1B0 80240130 8E240084 */ lw $a0, 0x84($s1) -/* C3D1B4 80240134 0C04C3D6 */ jal get_item_entity -/* C3D1B8 80240138 00A0802D */ daddu $s0, $a1, $zero -/* C3D1BC 8024013C 12000005 */ beqz $s0, .L80240154 -/* C3D1C0 80240140 0040902D */ daddu $s2, $v0, $zero -/* C3D1C4 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* C3D1C8 80240148 AE200074 */ sw $zero, 0x74($s1) -/* C3D1CC 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* C3D1D0 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* C3D1D4 80240154 8E230074 */ lw $v1, 0x74($s1) -/* C3D1D8 80240158 10600005 */ beqz $v1, .L80240170 -/* C3D1DC 8024015C 24020001 */ addiu $v0, $zero, 1 -/* C3D1E0 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* C3D1E4 80240164 00000000 */ nop -/* C3D1E8 80240168 08090093 */ j .L8024024C -/* C3D1EC 8024016C 00000000 */ nop -.L80240170: -/* C3D1F0 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* C3D1F4 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* C3D1F8 80240178 44810000 */ mtc1 $at, $f0 -/* C3D1FC 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* C3D200 80240180 46806320 */ cvt.s.w $f12, $f12 -/* C3D204 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* C3D208 80240188 00000000 */ nop -/* C3D20C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* C3D210 80240190 44810000 */ mtc1 $at, $f0 -/* C3D214 80240194 0C00A874 */ jal cos_rad -/* C3D218 80240198 46006303 */ div.s $f12, $f12, $f0 -/* C3D21C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* C3D220 802401A0 44811000 */ mtc1 $at, $f2 -/* C3D224 802401A4 00000000 */ nop -/* C3D228 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* C3D22C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* C3D230 802401B0 44810000 */ mtc1 $at, $f0 -/* C3D234 802401B4 00000000 */ nop -/* C3D238 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* C3D23C 802401BC 00000000 */ nop -/* C3D240 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* C3D244 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* C3D248 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* C3D24C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* C3D250 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* C3D254 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* C3D258 802401D8 24620001 */ addiu $v0, $v1, 1 -/* C3D25C 802401DC 24020001 */ addiu $v0, $zero, 1 -/* C3D260 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* C3D264 802401E4 08090093 */ j .L8024024C -/* C3D268 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* C3D26C 802401EC 08090093 */ j .L8024024C -/* C3D270 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* C3D274 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* C3D278 802401F8 0C00A8D4 */ jal cos_deg -/* C3D27C 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* C3D280 80240200 3C014040 */ lui $at, 0x4040 -/* C3D284 80240204 44811000 */ mtc1 $at, $f2 -/* C3D288 80240208 00000000 */ nop -/* C3D28C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* C3D290 80240210 00000000 */ nop -/* C3D294 80240214 3C014188 */ lui $at, 0x4188 -/* C3D298 80240218 44812000 */ mtc1 $at, $f4 -/* C3D29C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* C3D2A0 80240220 46041080 */ add.s $f2, $f2, $f4 -/* C3D2A4 80240224 46001080 */ add.s $f2, $f2, $f0 -/* C3D2A8 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* C3D2AC 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* C3D2B0 80240230 24420009 */ addiu $v0, $v0, 9 -/* C3D2B4 80240234 44826000 */ mtc1 $v0, $f12 -/* C3D2B8 80240238 00000000 */ nop -/* C3D2BC 8024023C 0C00A6C9 */ jal clamp_angle -/* C3D2C0 80240240 46806320 */ cvt.s.w $f12, $f12 -/* C3D2C4 80240244 4600018D */ trunc.w.s $f6, $f0 -/* C3D2C8 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* C3D2CC 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* C3D2D0 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* C3D2D4 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* C3D2D8 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* C3D2DC 8024025C 0000102D */ daddu $v0, $zero, $zero -/* C3D2E0 80240260 03E00008 */ jr $ra -/* C3D2E4 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240118_C4E008.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240118_C4E008.s deleted file mode 100644 index c5d4c9ea45..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240118_C4E008.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_C4E008 -/* C4E008 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4E00C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* C4E010 80240120 0080882D */ daddu $s1, $a0, $zero -/* C4E014 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* C4E018 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* C4E01C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* C4E020 80240130 8E240084 */ lw $a0, 0x84($s1) -/* C4E024 80240134 0C04C3D6 */ jal get_item_entity -/* C4E028 80240138 00A0802D */ daddu $s0, $a1, $zero -/* C4E02C 8024013C 12000005 */ beqz $s0, .L80240154 -/* C4E030 80240140 0040902D */ daddu $s2, $v0, $zero -/* C4E034 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* C4E038 80240148 AE200074 */ sw $zero, 0x74($s1) -/* C4E03C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* C4E040 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* C4E044 80240154 8E230074 */ lw $v1, 0x74($s1) -/* C4E048 80240158 10600005 */ beqz $v1, .L80240170 -/* C4E04C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* C4E050 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* C4E054 80240164 00000000 */ nop -/* C4E058 80240168 08090093 */ j .L8024024C -/* C4E05C 8024016C 00000000 */ nop -.L80240170: -/* C4E060 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* C4E064 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* C4E068 80240178 44810000 */ mtc1 $at, $f0 -/* C4E06C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* C4E070 80240180 46806320 */ cvt.s.w $f12, $f12 -/* C4E074 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* C4E078 80240188 00000000 */ nop -/* C4E07C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* C4E080 80240190 44810000 */ mtc1 $at, $f0 -/* C4E084 80240194 0C00A874 */ jal cos_rad -/* C4E088 80240198 46006303 */ div.s $f12, $f12, $f0 -/* C4E08C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* C4E090 802401A0 44811000 */ mtc1 $at, $f2 -/* C4E094 802401A4 00000000 */ nop -/* C4E098 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* C4E09C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* C4E0A0 802401B0 44810000 */ mtc1 $at, $f0 -/* C4E0A4 802401B4 00000000 */ nop -/* C4E0A8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* C4E0AC 802401BC 00000000 */ nop -/* C4E0B0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* C4E0B4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* C4E0B8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* C4E0BC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* C4E0C0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* C4E0C4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* C4E0C8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* C4E0CC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* C4E0D0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* C4E0D4 802401E4 08090093 */ j .L8024024C -/* C4E0D8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* C4E0DC 802401EC 08090093 */ j .L8024024C -/* C4E0E0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* C4E0E4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* C4E0E8 802401F8 0C00A8D4 */ jal cos_deg -/* C4E0EC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* C4E0F0 80240200 3C014040 */ lui $at, 0x4040 -/* C4E0F4 80240204 44811000 */ mtc1 $at, $f2 -/* C4E0F8 80240208 00000000 */ nop -/* C4E0FC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* C4E100 80240210 00000000 */ nop -/* C4E104 80240214 3C014188 */ lui $at, 0x4188 -/* C4E108 80240218 44812000 */ mtc1 $at, $f4 -/* C4E10C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* C4E110 80240220 46041080 */ add.s $f2, $f2, $f4 -/* C4E114 80240224 46001080 */ add.s $f2, $f2, $f0 -/* C4E118 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* C4E11C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* C4E120 80240230 24420009 */ addiu $v0, $v0, 9 -/* C4E124 80240234 44826000 */ mtc1 $v0, $f12 -/* C4E128 80240238 00000000 */ nop -/* C4E12C 8024023C 0C00A6C9 */ jal clamp_angle -/* C4E130 80240240 46806320 */ cvt.s.w $f12, $f12 -/* C4E134 80240244 4600018D */ trunc.w.s $f6, $f0 -/* C4E138 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* C4E13C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* C4E140 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* C4E144 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* C4E148 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* C4E14C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* C4E150 80240260 03E00008 */ jr $ra -/* C4E154 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_802410C8_C57008.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_802410C8_C57008.s deleted file mode 100644 index d5bac78964..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_802410C8_C57008.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410C8_C57008 -/* C57008 802410C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5700C 802410CC AFB10014 */ sw $s1, 0x14($sp) -/* C57010 802410D0 0080882D */ daddu $s1, $a0, $zero -/* C57014 802410D4 AFBF001C */ sw $ra, 0x1c($sp) -/* C57018 802410D8 AFB20018 */ sw $s2, 0x18($sp) -/* C5701C 802410DC AFB00010 */ sw $s0, 0x10($sp) -/* C57020 802410E0 8E240084 */ lw $a0, 0x84($s1) -/* C57024 802410E4 0C04C3D6 */ jal get_item_entity -/* C57028 802410E8 00A0802D */ daddu $s0, $a1, $zero -/* C5702C 802410EC 12000005 */ beqz $s0, .L80241104 -/* C57030 802410F0 0040902D */ daddu $s2, $v0, $zero -/* C57034 802410F4 C640000C */ lwc1 $f0, 0xc($s2) -/* C57038 802410F8 AE200074 */ sw $zero, 0x74($s1) -/* C5703C 802410FC AE20007C */ sw $zero, 0x7c($s1) -/* C57040 80241100 E6200078 */ swc1 $f0, 0x78($s1) -.L80241104: -/* C57044 80241104 8E230074 */ lw $v1, 0x74($s1) -/* C57048 80241108 10600005 */ beqz $v1, .L80241120 -/* C5704C 8024110C 24020001 */ addiu $v0, $zero, 1 -/* C57050 80241110 10620024 */ beq $v1, $v0, .L802411A4 -/* C57054 80241114 00000000 */ nop -/* C57058 80241118 0809047F */ j .L802411FC -/* C5705C 8024111C 00000000 */ nop -.L80241120: -/* C57060 80241120 3C013FC9 */ lui $at, 0x3fc9 -/* C57064 80241124 34210FD8 */ ori $at, $at, 0xfd8 -/* C57068 80241128 44810000 */ mtc1 $at, $f0 -/* C5706C 8024112C C62C007C */ lwc1 $f12, 0x7c($s1) -/* C57070 80241130 46806320 */ cvt.s.w $f12, $f12 -/* C57074 80241134 46006302 */ mul.s $f12, $f12, $f0 -/* C57078 80241138 00000000 */ nop -/* C5707C 8024113C 3C0141F0 */ lui $at, 0x41f0 -/* C57080 80241140 44810000 */ mtc1 $at, $f0 -/* C57084 80241144 0C00A874 */ jal cos_rad -/* C57088 80241148 46006303 */ div.s $f12, $f12, $f0 -/* C5708C 8024114C 3C013F80 */ lui $at, 0x3f80 -/* C57090 80241150 44811000 */ mtc1 $at, $f2 -/* C57094 80241154 00000000 */ nop -/* C57098 80241158 46001081 */ sub.s $f2, $f2, $f0 -/* C5709C 8024115C 3C0141A0 */ lui $at, 0x41a0 -/* C570A0 80241160 44810000 */ mtc1 $at, $f0 -/* C570A4 80241164 00000000 */ nop -/* C570A8 80241168 46001082 */ mul.s $f2, $f2, $f0 -/* C570AC 8024116C 00000000 */ nop -/* C570B0 80241170 C6200078 */ lwc1 $f0, 0x78($s1) -/* C570B4 80241174 46020000 */ add.s $f0, $f0, $f2 -/* C570B8 80241178 E640000C */ swc1 $f0, 0xc($s2) -/* C570BC 8024117C 8E23007C */ lw $v1, 0x7c($s1) -/* C570C0 80241180 2402001E */ addiu $v0, $zero, 0x1e -/* C570C4 80241184 14620005 */ bne $v1, $v0, .L8024119C -/* C570C8 80241188 24620001 */ addiu $v0, $v1, 1 -/* C570CC 8024118C 24020001 */ addiu $v0, $zero, 1 -/* C570D0 80241190 AE220074 */ sw $v0, 0x74($s1) -/* C570D4 80241194 0809047F */ j .L802411FC -/* C570D8 80241198 AE20007C */ sw $zero, 0x7c($s1) -.L8024119C: -/* C570DC 8024119C 0809047F */ j .L802411FC -/* C570E0 802411A0 AE22007C */ sw $v0, 0x7c($s1) -.L802411A4: -/* C570E4 802411A4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* C570E8 802411A8 0C00A8D4 */ jal cos_deg -/* C570EC 802411AC 46806320 */ cvt.s.w $f12, $f12 -/* C570F0 802411B0 3C014040 */ lui $at, 0x4040 -/* C570F4 802411B4 44811000 */ mtc1 $at, $f2 -/* C570F8 802411B8 00000000 */ nop -/* C570FC 802411BC 46020002 */ mul.s $f0, $f0, $f2 -/* C57100 802411C0 00000000 */ nop -/* C57104 802411C4 3C014188 */ lui $at, 0x4188 -/* C57108 802411C8 44812000 */ mtc1 $at, $f4 -/* C5710C 802411CC C6220078 */ lwc1 $f2, 0x78($s1) -/* C57110 802411D0 46041080 */ add.s $f2, $f2, $f4 -/* C57114 802411D4 46001080 */ add.s $f2, $f2, $f0 -/* C57118 802411D8 E642000C */ swc1 $f2, 0xc($s2) -/* C5711C 802411DC 8E22007C */ lw $v0, 0x7c($s1) -/* C57120 802411E0 24420009 */ addiu $v0, $v0, 9 -/* C57124 802411E4 44826000 */ mtc1 $v0, $f12 -/* C57128 802411E8 00000000 */ nop -/* C5712C 802411EC 0C00A6C9 */ jal clamp_angle -/* C57130 802411F0 46806320 */ cvt.s.w $f12, $f12 -/* C57134 802411F4 4600018D */ trunc.w.s $f6, $f0 -/* C57138 802411F8 E626007C */ swc1 $f6, 0x7c($s1) -.L802411FC: -/* C5713C 802411FC 8FBF001C */ lw $ra, 0x1c($sp) -/* C57140 80241200 8FB20018 */ lw $s2, 0x18($sp) -/* C57144 80241204 8FB10014 */ lw $s1, 0x14($sp) -/* C57148 80241208 8FB00010 */ lw $s0, 0x10($sp) -/* C5714C 8024120C 0000102D */ daddu $v0, $zero, $zero -/* C57150 80241210 03E00008 */ jr $ra -/* C57154 80241214 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s deleted file mode 100644 index 404358a58c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420E8_A3B5C8 -/* A3B5C8 802420E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3B5CC 802420EC AFB10014 */ sw $s1, 0x14($sp) -/* A3B5D0 802420F0 0080882D */ daddu $s1, $a0, $zero -/* A3B5D4 802420F4 AFBF001C */ sw $ra, 0x1c($sp) -/* A3B5D8 802420F8 AFB20018 */ sw $s2, 0x18($sp) -/* A3B5DC 802420FC AFB00010 */ sw $s0, 0x10($sp) -/* A3B5E0 80242100 8E240084 */ lw $a0, 0x84($s1) -/* A3B5E4 80242104 0C04C3D6 */ jal get_item_entity -/* A3B5E8 80242108 00A0802D */ daddu $s0, $a1, $zero -/* A3B5EC 8024210C 12000005 */ beqz $s0, .L80242124 -/* A3B5F0 80242110 0040902D */ daddu $s2, $v0, $zero -/* A3B5F4 80242114 C640000C */ lwc1 $f0, 0xc($s2) -/* A3B5F8 80242118 AE200074 */ sw $zero, 0x74($s1) -/* A3B5FC 8024211C AE20007C */ sw $zero, 0x7c($s1) -/* A3B600 80242120 E6200078 */ swc1 $f0, 0x78($s1) -.L80242124: -/* A3B604 80242124 8E230074 */ lw $v1, 0x74($s1) -/* A3B608 80242128 10600005 */ beqz $v1, .L80242140 -/* A3B60C 8024212C 24020001 */ addiu $v0, $zero, 1 -/* A3B610 80242130 10620024 */ beq $v1, $v0, .L802421C4 -/* A3B614 80242134 00000000 */ nop -/* A3B618 80242138 08090887 */ j .L8024221C -/* A3B61C 8024213C 00000000 */ nop -.L80242140: -/* A3B620 80242140 3C013FC9 */ lui $at, 0x3fc9 -/* A3B624 80242144 34210FD8 */ ori $at, $at, 0xfd8 -/* A3B628 80242148 44810000 */ mtc1 $at, $f0 -/* A3B62C 8024214C C62C007C */ lwc1 $f12, 0x7c($s1) -/* A3B630 80242150 46806320 */ cvt.s.w $f12, $f12 -/* A3B634 80242154 46006302 */ mul.s $f12, $f12, $f0 -/* A3B638 80242158 00000000 */ nop -/* A3B63C 8024215C 3C0141F0 */ lui $at, 0x41f0 -/* A3B640 80242160 44810000 */ mtc1 $at, $f0 -/* A3B644 80242164 0C00A874 */ jal cos_rad -/* A3B648 80242168 46006303 */ div.s $f12, $f12, $f0 -/* A3B64C 8024216C 3C013F80 */ lui $at, 0x3f80 -/* A3B650 80242170 44811000 */ mtc1 $at, $f2 -/* A3B654 80242174 00000000 */ nop -/* A3B658 80242178 46001081 */ sub.s $f2, $f2, $f0 -/* A3B65C 8024217C 3C0141A0 */ lui $at, 0x41a0 -/* A3B660 80242180 44810000 */ mtc1 $at, $f0 -/* A3B664 80242184 00000000 */ nop -/* A3B668 80242188 46001082 */ mul.s $f2, $f2, $f0 -/* A3B66C 8024218C 00000000 */ nop -/* A3B670 80242190 C6200078 */ lwc1 $f0, 0x78($s1) -/* A3B674 80242194 46020000 */ add.s $f0, $f0, $f2 -/* A3B678 80242198 E640000C */ swc1 $f0, 0xc($s2) -/* A3B67C 8024219C 8E23007C */ lw $v1, 0x7c($s1) -/* A3B680 802421A0 2402001E */ addiu $v0, $zero, 0x1e -/* A3B684 802421A4 14620005 */ bne $v1, $v0, .L802421BC -/* A3B688 802421A8 24620001 */ addiu $v0, $v1, 1 -/* A3B68C 802421AC 24020001 */ addiu $v0, $zero, 1 -/* A3B690 802421B0 AE220074 */ sw $v0, 0x74($s1) -/* A3B694 802421B4 08090887 */ j .L8024221C -/* A3B698 802421B8 AE20007C */ sw $zero, 0x7c($s1) -.L802421BC: -/* A3B69C 802421BC 08090887 */ j .L8024221C -/* A3B6A0 802421C0 AE22007C */ sw $v0, 0x7c($s1) -.L802421C4: -/* A3B6A4 802421C4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* A3B6A8 802421C8 0C00A8D4 */ jal cos_deg -/* A3B6AC 802421CC 46806320 */ cvt.s.w $f12, $f12 -/* A3B6B0 802421D0 3C014040 */ lui $at, 0x4040 -/* A3B6B4 802421D4 44811000 */ mtc1 $at, $f2 -/* A3B6B8 802421D8 00000000 */ nop -/* A3B6BC 802421DC 46020002 */ mul.s $f0, $f0, $f2 -/* A3B6C0 802421E0 00000000 */ nop -/* A3B6C4 802421E4 3C014188 */ lui $at, 0x4188 -/* A3B6C8 802421E8 44812000 */ mtc1 $at, $f4 -/* A3B6CC 802421EC C6220078 */ lwc1 $f2, 0x78($s1) -/* A3B6D0 802421F0 46041080 */ add.s $f2, $f2, $f4 -/* A3B6D4 802421F4 46001080 */ add.s $f2, $f2, $f0 -/* A3B6D8 802421F8 E642000C */ swc1 $f2, 0xc($s2) -/* A3B6DC 802421FC 8E22007C */ lw $v0, 0x7c($s1) -/* A3B6E0 80242200 24420009 */ addiu $v0, $v0, 9 -/* A3B6E4 80242204 44826000 */ mtc1 $v0, $f12 -/* A3B6E8 80242208 00000000 */ nop -/* A3B6EC 8024220C 0C00A6C9 */ jal clamp_angle -/* A3B6F0 80242210 46806320 */ cvt.s.w $f12, $f12 -/* A3B6F4 80242214 4600018D */ trunc.w.s $f6, $f0 -/* A3B6F8 80242218 E626007C */ swc1 $f6, 0x7c($s1) -.L8024221C: -/* A3B6FC 8024221C 8FBF001C */ lw $ra, 0x1c($sp) -/* A3B700 80242220 8FB20018 */ lw $s2, 0x18($sp) -/* A3B704 80242224 8FB10014 */ lw $s1, 0x14($sp) -/* A3B708 80242228 8FB00010 */ lw $s0, 0x10($sp) -/* A3B70C 8024222C 0000102D */ daddu $v0, $zero, $zero -/* A3B710 80242230 03E00008 */ jr $ra -/* A3B714 80242234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240118_9865F8.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240118_9865F8.s deleted file mode 100644 index 467af68977..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240118_9865F8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_9865F8 -/* 9865F8 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9865FC 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* 986600 80240120 0080882D */ daddu $s1, $a0, $zero -/* 986604 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* 986608 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* 98660C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* 986610 80240130 8E240084 */ lw $a0, 0x84($s1) -/* 986614 80240134 0C04C3D6 */ jal get_item_entity -/* 986618 80240138 00A0802D */ daddu $s0, $a1, $zero -/* 98661C 8024013C 12000005 */ beqz $s0, .L80240154 -/* 986620 80240140 0040902D */ daddu $s2, $v0, $zero -/* 986624 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* 986628 80240148 AE200074 */ sw $zero, 0x74($s1) -/* 98662C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* 986630 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* 986634 80240154 8E230074 */ lw $v1, 0x74($s1) -/* 986638 80240158 10600005 */ beqz $v1, .L80240170 -/* 98663C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* 986640 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* 986644 80240164 00000000 */ nop -/* 986648 80240168 08090093 */ j .L8024024C -/* 98664C 8024016C 00000000 */ nop -.L80240170: -/* 986650 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* 986654 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* 986658 80240178 44810000 */ mtc1 $at, $f0 -/* 98665C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 986660 80240180 46806320 */ cvt.s.w $f12, $f12 -/* 986664 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* 986668 80240188 00000000 */ nop -/* 98666C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* 986670 80240190 44810000 */ mtc1 $at, $f0 -/* 986674 80240194 0C00A874 */ jal cos_rad -/* 986678 80240198 46006303 */ div.s $f12, $f12, $f0 -/* 98667C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 986680 802401A0 44811000 */ mtc1 $at, $f2 -/* 986684 802401A4 00000000 */ nop -/* 986688 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* 98668C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* 986690 802401B0 44810000 */ mtc1 $at, $f0 -/* 986694 802401B4 00000000 */ nop -/* 986698 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* 98669C 802401BC 00000000 */ nop -/* 9866A0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9866A4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* 9866A8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* 9866AC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* 9866B0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* 9866B4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* 9866B8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* 9866BC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* 9866C0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* 9866C4 802401E4 08090093 */ j .L8024024C -/* 9866C8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* 9866CC 802401EC 08090093 */ j .L8024024C -/* 9866D0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* 9866D4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 9866D8 802401F8 0C00A8D4 */ jal cos_deg -/* 9866DC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* 9866E0 80240200 3C014040 */ lui $at, 0x4040 -/* 9866E4 80240204 44811000 */ mtc1 $at, $f2 -/* 9866E8 80240208 00000000 */ nop -/* 9866EC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* 9866F0 80240210 00000000 */ nop -/* 9866F4 80240214 3C014188 */ lui $at, 0x4188 -/* 9866F8 80240218 44812000 */ mtc1 $at, $f4 -/* 9866FC 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* 986700 80240220 46041080 */ add.s $f2, $f2, $f4 -/* 986704 80240224 46001080 */ add.s $f2, $f2, $f0 -/* 986708 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* 98670C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* 986710 80240230 24420009 */ addiu $v0, $v0, 9 -/* 986714 80240234 44826000 */ mtc1 $v0, $f12 -/* 986718 80240238 00000000 */ nop -/* 98671C 8024023C 0C00A6C9 */ jal clamp_angle -/* 986720 80240240 46806320 */ cvt.s.w $f12, $f12 -/* 986724 80240244 4600018D */ trunc.w.s $f6, $f0 -/* 986728 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* 98672C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* 986730 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* 986734 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* 986738 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* 98673C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* 986740 80240260 03E00008 */ jr $ra -/* 986744 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240118_918CC8.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240118_918CC8.s deleted file mode 100644 index 24597a62b0..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240118_918CC8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_918CC8 -/* 918CC8 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 918CCC 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* 918CD0 80240120 0080882D */ daddu $s1, $a0, $zero -/* 918CD4 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* 918CD8 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* 918CDC 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* 918CE0 80240130 8E240084 */ lw $a0, 0x84($s1) -/* 918CE4 80240134 0C04C3D6 */ jal get_item_entity -/* 918CE8 80240138 00A0802D */ daddu $s0, $a1, $zero -/* 918CEC 8024013C 12000005 */ beqz $s0, .L80240154 -/* 918CF0 80240140 0040902D */ daddu $s2, $v0, $zero -/* 918CF4 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* 918CF8 80240148 AE200074 */ sw $zero, 0x74($s1) -/* 918CFC 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* 918D00 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* 918D04 80240154 8E230074 */ lw $v1, 0x74($s1) -/* 918D08 80240158 10600005 */ beqz $v1, .L80240170 -/* 918D0C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* 918D10 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* 918D14 80240164 00000000 */ nop -/* 918D18 80240168 08090093 */ j .L8024024C -/* 918D1C 8024016C 00000000 */ nop -.L80240170: -/* 918D20 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* 918D24 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* 918D28 80240178 44810000 */ mtc1 $at, $f0 -/* 918D2C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 918D30 80240180 46806320 */ cvt.s.w $f12, $f12 -/* 918D34 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* 918D38 80240188 00000000 */ nop -/* 918D3C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* 918D40 80240190 44810000 */ mtc1 $at, $f0 -/* 918D44 80240194 0C00A874 */ jal cos_rad -/* 918D48 80240198 46006303 */ div.s $f12, $f12, $f0 -/* 918D4C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 918D50 802401A0 44811000 */ mtc1 $at, $f2 -/* 918D54 802401A4 00000000 */ nop -/* 918D58 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* 918D5C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* 918D60 802401B0 44810000 */ mtc1 $at, $f0 -/* 918D64 802401B4 00000000 */ nop -/* 918D68 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* 918D6C 802401BC 00000000 */ nop -/* 918D70 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 918D74 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* 918D78 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* 918D7C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* 918D80 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* 918D84 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* 918D88 802401D8 24620001 */ addiu $v0, $v1, 1 -/* 918D8C 802401DC 24020001 */ addiu $v0, $zero, 1 -/* 918D90 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* 918D94 802401E4 08090093 */ j .L8024024C -/* 918D98 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* 918D9C 802401EC 08090093 */ j .L8024024C -/* 918DA0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* 918DA4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 918DA8 802401F8 0C00A8D4 */ jal cos_deg -/* 918DAC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* 918DB0 80240200 3C014040 */ lui $at, 0x4040 -/* 918DB4 80240204 44811000 */ mtc1 $at, $f2 -/* 918DB8 80240208 00000000 */ nop -/* 918DBC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* 918DC0 80240210 00000000 */ nop -/* 918DC4 80240214 3C014188 */ lui $at, 0x4188 -/* 918DC8 80240218 44812000 */ mtc1 $at, $f4 -/* 918DCC 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* 918DD0 80240220 46041080 */ add.s $f2, $f2, $f4 -/* 918DD4 80240224 46001080 */ add.s $f2, $f2, $f0 -/* 918DD8 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* 918DDC 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* 918DE0 80240230 24420009 */ addiu $v0, $v0, 9 -/* 918DE4 80240234 44826000 */ mtc1 $v0, $f12 -/* 918DE8 80240238 00000000 */ nop -/* 918DEC 8024023C 0C00A6C9 */ jal clamp_angle -/* 918DF0 80240240 46806320 */ cvt.s.w $f12, $f12 -/* 918DF4 80240244 4600018D */ trunc.w.s $f6, $f0 -/* 918DF8 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* 918DFC 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* 918E00 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* 918E04 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* 918E08 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* 918E0C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* 918E10 80240260 03E00008 */ jr $ra -/* 918E14 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s deleted file mode 100644 index 725b0403e3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240468_B44BD8 -/* B44BD8 80240468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B44BDC 8024046C AFB10014 */ sw $s1, 0x14($sp) -/* B44BE0 80240470 0080882D */ daddu $s1, $a0, $zero -/* B44BE4 80240474 AFBF001C */ sw $ra, 0x1c($sp) -/* B44BE8 80240478 AFB20018 */ sw $s2, 0x18($sp) -/* B44BEC 8024047C AFB00010 */ sw $s0, 0x10($sp) -/* B44BF0 80240480 8E240084 */ lw $a0, 0x84($s1) -/* B44BF4 80240484 0C04C3D6 */ jal get_item_entity -/* B44BF8 80240488 00A0802D */ daddu $s0, $a1, $zero -/* B44BFC 8024048C 12000005 */ beqz $s0, .L802404A4 -/* B44C00 80240490 0040902D */ daddu $s2, $v0, $zero -/* B44C04 80240494 C640000C */ lwc1 $f0, 0xc($s2) -/* B44C08 80240498 AE200074 */ sw $zero, 0x74($s1) -/* B44C0C 8024049C AE20007C */ sw $zero, 0x7c($s1) -/* B44C10 802404A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802404A4: -/* B44C14 802404A4 8E230074 */ lw $v1, 0x74($s1) -/* B44C18 802404A8 10600005 */ beqz $v1, .L802404C0 -/* B44C1C 802404AC 24020001 */ addiu $v0, $zero, 1 -/* B44C20 802404B0 10620024 */ beq $v1, $v0, .L80240544 -/* B44C24 802404B4 00000000 */ nop -/* B44C28 802404B8 08090167 */ j .L8024059C -/* B44C2C 802404BC 00000000 */ nop -.L802404C0: -/* B44C30 802404C0 3C013FC9 */ lui $at, 0x3fc9 -/* B44C34 802404C4 34210FD8 */ ori $at, $at, 0xfd8 -/* B44C38 802404C8 44810000 */ mtc1 $at, $f0 -/* B44C3C 802404CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* B44C40 802404D0 46806320 */ cvt.s.w $f12, $f12 -/* B44C44 802404D4 46006302 */ mul.s $f12, $f12, $f0 -/* B44C48 802404D8 00000000 */ nop -/* B44C4C 802404DC 3C0141F0 */ lui $at, 0x41f0 -/* B44C50 802404E0 44810000 */ mtc1 $at, $f0 -/* B44C54 802404E4 0C00A874 */ jal cos_rad -/* B44C58 802404E8 46006303 */ div.s $f12, $f12, $f0 -/* B44C5C 802404EC 3C013F80 */ lui $at, 0x3f80 -/* B44C60 802404F0 44811000 */ mtc1 $at, $f2 -/* B44C64 802404F4 00000000 */ nop -/* B44C68 802404F8 46001081 */ sub.s $f2, $f2, $f0 -/* B44C6C 802404FC 3C0141A0 */ lui $at, 0x41a0 -/* B44C70 80240500 44810000 */ mtc1 $at, $f0 -/* B44C74 80240504 00000000 */ nop -/* B44C78 80240508 46001082 */ mul.s $f2, $f2, $f0 -/* B44C7C 8024050C 00000000 */ nop -/* B44C80 80240510 C6200078 */ lwc1 $f0, 0x78($s1) -/* B44C84 80240514 46020000 */ add.s $f0, $f0, $f2 -/* B44C88 80240518 E640000C */ swc1 $f0, 0xc($s2) -/* B44C8C 8024051C 8E23007C */ lw $v1, 0x7c($s1) -/* B44C90 80240520 2402001E */ addiu $v0, $zero, 0x1e -/* B44C94 80240524 14620005 */ bne $v1, $v0, .L8024053C -/* B44C98 80240528 24620001 */ addiu $v0, $v1, 1 -/* B44C9C 8024052C 24020001 */ addiu $v0, $zero, 1 -/* B44CA0 80240530 AE220074 */ sw $v0, 0x74($s1) -/* B44CA4 80240534 08090167 */ j .L8024059C -/* B44CA8 80240538 AE20007C */ sw $zero, 0x7c($s1) -.L8024053C: -/* B44CAC 8024053C 08090167 */ j .L8024059C -/* B44CB0 80240540 AE22007C */ sw $v0, 0x7c($s1) -.L80240544: -/* B44CB4 80240544 C62C007C */ lwc1 $f12, 0x7c($s1) -/* B44CB8 80240548 0C00A8D4 */ jal cos_deg -/* B44CBC 8024054C 46806320 */ cvt.s.w $f12, $f12 -/* B44CC0 80240550 3C014040 */ lui $at, 0x4040 -/* B44CC4 80240554 44811000 */ mtc1 $at, $f2 -/* B44CC8 80240558 00000000 */ nop -/* B44CCC 8024055C 46020002 */ mul.s $f0, $f0, $f2 -/* B44CD0 80240560 00000000 */ nop -/* B44CD4 80240564 3C014188 */ lui $at, 0x4188 -/* B44CD8 80240568 44812000 */ mtc1 $at, $f4 -/* B44CDC 8024056C C6220078 */ lwc1 $f2, 0x78($s1) -/* B44CE0 80240570 46041080 */ add.s $f2, $f2, $f4 -/* B44CE4 80240574 46001080 */ add.s $f2, $f2, $f0 -/* B44CE8 80240578 E642000C */ swc1 $f2, 0xc($s2) -/* B44CEC 8024057C 8E22007C */ lw $v0, 0x7c($s1) -/* B44CF0 80240580 24420009 */ addiu $v0, $v0, 9 -/* B44CF4 80240584 44826000 */ mtc1 $v0, $f12 -/* B44CF8 80240588 00000000 */ nop -/* B44CFC 8024058C 0C00A6C9 */ jal clamp_angle -/* B44D00 80240590 46806320 */ cvt.s.w $f12, $f12 -/* B44D04 80240594 4600018D */ trunc.w.s $f6, $f0 -/* B44D08 80240598 E626007C */ swc1 $f6, 0x7c($s1) -.L8024059C: -/* B44D0C 8024059C 8FBF001C */ lw $ra, 0x1c($sp) -/* B44D10 802405A0 8FB20018 */ lw $s2, 0x18($sp) -/* B44D14 802405A4 8FB10014 */ lw $s1, 0x14($sp) -/* B44D18 802405A8 8FB00010 */ lw $s0, 0x10($sp) -/* B44D1C 802405AC 0000102D */ daddu $v0, $zero, $zero -/* B44D20 802405B0 03E00008 */ jr $ra -/* B44D24 802405B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240118_AF1D78.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240118_AF1D78.s deleted file mode 100644 index 7fb46ed2bc..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240118_AF1D78.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_AF1D78 -/* AF1D78 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF1D7C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* AF1D80 80240120 0080882D */ daddu $s1, $a0, $zero -/* AF1D84 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* AF1D88 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* AF1D8C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* AF1D90 80240130 8E240084 */ lw $a0, 0x84($s1) -/* AF1D94 80240134 0C04C3D6 */ jal get_item_entity -/* AF1D98 80240138 00A0802D */ daddu $s0, $a1, $zero -/* AF1D9C 8024013C 12000005 */ beqz $s0, .L80240154 -/* AF1DA0 80240140 0040902D */ daddu $s2, $v0, $zero -/* AF1DA4 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* AF1DA8 80240148 AE200074 */ sw $zero, 0x74($s1) -/* AF1DAC 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* AF1DB0 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* AF1DB4 80240154 8E230074 */ lw $v1, 0x74($s1) -/* AF1DB8 80240158 10600005 */ beqz $v1, .L80240170 -/* AF1DBC 8024015C 24020001 */ addiu $v0, $zero, 1 -/* AF1DC0 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* AF1DC4 80240164 00000000 */ nop -/* AF1DC8 80240168 08090093 */ j .L8024024C -/* AF1DCC 8024016C 00000000 */ nop -.L80240170: -/* AF1DD0 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* AF1DD4 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* AF1DD8 80240178 44810000 */ mtc1 $at, $f0 -/* AF1DDC 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* AF1DE0 80240180 46806320 */ cvt.s.w $f12, $f12 -/* AF1DE4 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* AF1DE8 80240188 00000000 */ nop -/* AF1DEC 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* AF1DF0 80240190 44810000 */ mtc1 $at, $f0 -/* AF1DF4 80240194 0C00A874 */ jal cos_rad -/* AF1DF8 80240198 46006303 */ div.s $f12, $f12, $f0 -/* AF1DFC 8024019C 3C013F80 */ lui $at, 0x3f80 -/* AF1E00 802401A0 44811000 */ mtc1 $at, $f2 -/* AF1E04 802401A4 00000000 */ nop -/* AF1E08 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* AF1E0C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* AF1E10 802401B0 44810000 */ mtc1 $at, $f0 -/* AF1E14 802401B4 00000000 */ nop -/* AF1E18 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* AF1E1C 802401BC 00000000 */ nop -/* AF1E20 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* AF1E24 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* AF1E28 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* AF1E2C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* AF1E30 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* AF1E34 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* AF1E38 802401D8 24620001 */ addiu $v0, $v1, 1 -/* AF1E3C 802401DC 24020001 */ addiu $v0, $zero, 1 -/* AF1E40 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* AF1E44 802401E4 08090093 */ j .L8024024C -/* AF1E48 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* AF1E4C 802401EC 08090093 */ j .L8024024C -/* AF1E50 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* AF1E54 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* AF1E58 802401F8 0C00A8D4 */ jal cos_deg -/* AF1E5C 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* AF1E60 80240200 3C014040 */ lui $at, 0x4040 -/* AF1E64 80240204 44811000 */ mtc1 $at, $f2 -/* AF1E68 80240208 00000000 */ nop -/* AF1E6C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* AF1E70 80240210 00000000 */ nop -/* AF1E74 80240214 3C014188 */ lui $at, 0x4188 -/* AF1E78 80240218 44812000 */ mtc1 $at, $f4 -/* AF1E7C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* AF1E80 80240220 46041080 */ add.s $f2, $f2, $f4 -/* AF1E84 80240224 46001080 */ add.s $f2, $f2, $f0 -/* AF1E88 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* AF1E8C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* AF1E90 80240230 24420009 */ addiu $v0, $v0, 9 -/* AF1E94 80240234 44826000 */ mtc1 $v0, $f12 -/* AF1E98 80240238 00000000 */ nop -/* AF1E9C 8024023C 0C00A6C9 */ jal clamp_angle -/* AF1EA0 80240240 46806320 */ cvt.s.w $f12, $f12 -/* AF1EA4 80240244 4600018D */ trunc.w.s $f6, $f0 -/* AF1EA8 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* AF1EAC 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* AF1EB0 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* AF1EB4 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* AF1EB8 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* AF1EBC 8024025C 0000102D */ daddu $v0, $zero, $zero -/* AF1EC0 80240260 03E00008 */ jr $ra -/* AF1EC4 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240118_AFDC58.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240118_AFDC58.s deleted file mode 100644 index bb7b1d26e0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240118_AFDC58.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_AFDC58 -/* AFDC58 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AFDC5C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* AFDC60 80240120 0080882D */ daddu $s1, $a0, $zero -/* AFDC64 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* AFDC68 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* AFDC6C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* AFDC70 80240130 8E240084 */ lw $a0, 0x84($s1) -/* AFDC74 80240134 0C04C3D6 */ jal get_item_entity -/* AFDC78 80240138 00A0802D */ daddu $s0, $a1, $zero -/* AFDC7C 8024013C 12000005 */ beqz $s0, .L80240154 -/* AFDC80 80240140 0040902D */ daddu $s2, $v0, $zero -/* AFDC84 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* AFDC88 80240148 AE200074 */ sw $zero, 0x74($s1) -/* AFDC8C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* AFDC90 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* AFDC94 80240154 8E230074 */ lw $v1, 0x74($s1) -/* AFDC98 80240158 10600005 */ beqz $v1, .L80240170 -/* AFDC9C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* AFDCA0 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* AFDCA4 80240164 00000000 */ nop -/* AFDCA8 80240168 08090093 */ j .L8024024C -/* AFDCAC 8024016C 00000000 */ nop -.L80240170: -/* AFDCB0 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* AFDCB4 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* AFDCB8 80240178 44810000 */ mtc1 $at, $f0 -/* AFDCBC 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* AFDCC0 80240180 46806320 */ cvt.s.w $f12, $f12 -/* AFDCC4 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* AFDCC8 80240188 00000000 */ nop -/* AFDCCC 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* AFDCD0 80240190 44810000 */ mtc1 $at, $f0 -/* AFDCD4 80240194 0C00A874 */ jal cos_rad -/* AFDCD8 80240198 46006303 */ div.s $f12, $f12, $f0 -/* AFDCDC 8024019C 3C013F80 */ lui $at, 0x3f80 -/* AFDCE0 802401A0 44811000 */ mtc1 $at, $f2 -/* AFDCE4 802401A4 00000000 */ nop -/* AFDCE8 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* AFDCEC 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* AFDCF0 802401B0 44810000 */ mtc1 $at, $f0 -/* AFDCF4 802401B4 00000000 */ nop -/* AFDCF8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* AFDCFC 802401BC 00000000 */ nop -/* AFDD00 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* AFDD04 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* AFDD08 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* AFDD0C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* AFDD10 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* AFDD14 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* AFDD18 802401D8 24620001 */ addiu $v0, $v1, 1 -/* AFDD1C 802401DC 24020001 */ addiu $v0, $zero, 1 -/* AFDD20 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* AFDD24 802401E4 08090093 */ j .L8024024C -/* AFDD28 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* AFDD2C 802401EC 08090093 */ j .L8024024C -/* AFDD30 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* AFDD34 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* AFDD38 802401F8 0C00A8D4 */ jal cos_deg -/* AFDD3C 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* AFDD40 80240200 3C014040 */ lui $at, 0x4040 -/* AFDD44 80240204 44811000 */ mtc1 $at, $f2 -/* AFDD48 80240208 00000000 */ nop -/* AFDD4C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* AFDD50 80240210 00000000 */ nop -/* AFDD54 80240214 3C014188 */ lui $at, 0x4188 -/* AFDD58 80240218 44812000 */ mtc1 $at, $f4 -/* AFDD5C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* AFDD60 80240220 46041080 */ add.s $f2, $f2, $f4 -/* AFDD64 80240224 46001080 */ add.s $f2, $f2, $f0 -/* AFDD68 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* AFDD6C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* AFDD70 80240230 24420009 */ addiu $v0, $v0, 9 -/* AFDD74 80240234 44826000 */ mtc1 $v0, $f12 -/* AFDD78 80240238 00000000 */ nop -/* AFDD7C 8024023C 0C00A6C9 */ jal clamp_angle -/* AFDD80 80240240 46806320 */ cvt.s.w $f12, $f12 -/* AFDD84 80240244 4600018D */ trunc.w.s $f6, $f0 -/* AFDD88 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* AFDD8C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* AFDD90 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* AFDD94 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* AFDD98 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* AFDD9C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* AFDDA0 80240260 03E00008 */ jr $ra -/* AFDDA4 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s deleted file mode 100644 index 4dff088b72..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_8D85E8 -/* 8D85E8 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D85EC 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* 8D85F0 80240120 0080882D */ daddu $s1, $a0, $zero -/* 8D85F4 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* 8D85F8 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* 8D85FC 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* 8D8600 80240130 8E240084 */ lw $a0, 0x84($s1) -/* 8D8604 80240134 0C04C3D6 */ jal get_item_entity -/* 8D8608 80240138 00A0802D */ daddu $s0, $a1, $zero -/* 8D860C 8024013C 12000005 */ beqz $s0, .L80240154 -/* 8D8610 80240140 0040902D */ daddu $s2, $v0, $zero -/* 8D8614 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* 8D8618 80240148 AE200074 */ sw $zero, 0x74($s1) -/* 8D861C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* 8D8620 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* 8D8624 80240154 8E230074 */ lw $v1, 0x74($s1) -/* 8D8628 80240158 10600005 */ beqz $v1, .L80240170 -/* 8D862C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* 8D8630 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* 8D8634 80240164 00000000 */ nop -/* 8D8638 80240168 08090093 */ j .L8024024C -/* 8D863C 8024016C 00000000 */ nop -.L80240170: -/* 8D8640 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* 8D8644 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* 8D8648 80240178 44810000 */ mtc1 $at, $f0 -/* 8D864C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8D8650 80240180 46806320 */ cvt.s.w $f12, $f12 -/* 8D8654 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* 8D8658 80240188 00000000 */ nop -/* 8D865C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* 8D8660 80240190 44810000 */ mtc1 $at, $f0 -/* 8D8664 80240194 0C00A874 */ jal cos_rad -/* 8D8668 80240198 46006303 */ div.s $f12, $f12, $f0 -/* 8D866C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 8D8670 802401A0 44811000 */ mtc1 $at, $f2 -/* 8D8674 802401A4 00000000 */ nop -/* 8D8678 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* 8D867C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* 8D8680 802401B0 44810000 */ mtc1 $at, $f0 -/* 8D8684 802401B4 00000000 */ nop -/* 8D8688 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* 8D868C 802401BC 00000000 */ nop -/* 8D8690 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D8694 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* 8D8698 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* 8D869C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* 8D86A0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* 8D86A4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* 8D86A8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* 8D86AC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* 8D86B0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* 8D86B4 802401E4 08090093 */ j .L8024024C -/* 8D86B8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* 8D86BC 802401EC 08090093 */ j .L8024024C -/* 8D86C0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* 8D86C4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8D86C8 802401F8 0C00A8D4 */ jal cos_deg -/* 8D86CC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* 8D86D0 80240200 3C014040 */ lui $at, 0x4040 -/* 8D86D4 80240204 44811000 */ mtc1 $at, $f2 -/* 8D86D8 80240208 00000000 */ nop -/* 8D86DC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* 8D86E0 80240210 00000000 */ nop -/* 8D86E4 80240214 3C014188 */ lui $at, 0x4188 -/* 8D86E8 80240218 44812000 */ mtc1 $at, $f4 -/* 8D86EC 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* 8D86F0 80240220 46041080 */ add.s $f2, $f2, $f4 -/* 8D86F4 80240224 46001080 */ add.s $f2, $f2, $f0 -/* 8D86F8 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* 8D86FC 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* 8D8700 80240230 24420009 */ addiu $v0, $v0, 9 -/* 8D8704 80240234 44826000 */ mtc1 $v0, $f12 -/* 8D8708 80240238 00000000 */ nop -/* 8D870C 8024023C 0C00A6C9 */ jal clamp_angle -/* 8D8710 80240240 46806320 */ cvt.s.w $f12, $f12 -/* 8D8714 80240244 4600018D */ trunc.w.s $f6, $f0 -/* 8D8718 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* 8D871C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D8720 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* 8D8724 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* 8D8728 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* 8D872C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* 8D8730 80240260 03E00008 */ jr $ra -/* 8D8734 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s deleted file mode 100644 index 40f57aab73..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240498_A57948 -/* A57948 80240498 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A5794C 8024049C AFB10014 */ sw $s1, 0x14($sp) -/* A57950 802404A0 0080882D */ daddu $s1, $a0, $zero -/* A57954 802404A4 AFBF001C */ sw $ra, 0x1c($sp) -/* A57958 802404A8 AFB20018 */ sw $s2, 0x18($sp) -/* A5795C 802404AC AFB00010 */ sw $s0, 0x10($sp) -/* A57960 802404B0 8E240084 */ lw $a0, 0x84($s1) -/* A57964 802404B4 0C04C3D6 */ jal get_item_entity -/* A57968 802404B8 00A0802D */ daddu $s0, $a1, $zero -/* A5796C 802404BC 12000005 */ beqz $s0, .L802404D4 -/* A57970 802404C0 0040902D */ daddu $s2, $v0, $zero -/* A57974 802404C4 C640000C */ lwc1 $f0, 0xc($s2) -/* A57978 802404C8 AE200074 */ sw $zero, 0x74($s1) -/* A5797C 802404CC AE20007C */ sw $zero, 0x7c($s1) -/* A57980 802404D0 E6200078 */ swc1 $f0, 0x78($s1) -.L802404D4: -/* A57984 802404D4 8E230074 */ lw $v1, 0x74($s1) -/* A57988 802404D8 10600005 */ beqz $v1, .L802404F0 -/* A5798C 802404DC 24020001 */ addiu $v0, $zero, 1 -/* A57990 802404E0 10620024 */ beq $v1, $v0, .L80240574 -/* A57994 802404E4 00000000 */ nop -/* A57998 802404E8 08090173 */ j .L802405CC -/* A5799C 802404EC 00000000 */ nop -.L802404F0: -/* A579A0 802404F0 3C013FC9 */ lui $at, 0x3fc9 -/* A579A4 802404F4 34210FD8 */ ori $at, $at, 0xfd8 -/* A579A8 802404F8 44810000 */ mtc1 $at, $f0 -/* A579AC 802404FC C62C007C */ lwc1 $f12, 0x7c($s1) -/* A579B0 80240500 46806320 */ cvt.s.w $f12, $f12 -/* A579B4 80240504 46006302 */ mul.s $f12, $f12, $f0 -/* A579B8 80240508 00000000 */ nop -/* A579BC 8024050C 3C0141F0 */ lui $at, 0x41f0 -/* A579C0 80240510 44810000 */ mtc1 $at, $f0 -/* A579C4 80240514 0C00A874 */ jal cos_rad -/* A579C8 80240518 46006303 */ div.s $f12, $f12, $f0 -/* A579CC 8024051C 3C013F80 */ lui $at, 0x3f80 -/* A579D0 80240520 44811000 */ mtc1 $at, $f2 -/* A579D4 80240524 00000000 */ nop -/* A579D8 80240528 46001081 */ sub.s $f2, $f2, $f0 -/* A579DC 8024052C 3C0141A0 */ lui $at, 0x41a0 -/* A579E0 80240530 44810000 */ mtc1 $at, $f0 -/* A579E4 80240534 00000000 */ nop -/* A579E8 80240538 46001082 */ mul.s $f2, $f2, $f0 -/* A579EC 8024053C 00000000 */ nop -/* A579F0 80240540 C6200078 */ lwc1 $f0, 0x78($s1) -/* A579F4 80240544 46020000 */ add.s $f0, $f0, $f2 -/* A579F8 80240548 E640000C */ swc1 $f0, 0xc($s2) -/* A579FC 8024054C 8E23007C */ lw $v1, 0x7c($s1) -/* A57A00 80240550 2402001E */ addiu $v0, $zero, 0x1e -/* A57A04 80240554 14620005 */ bne $v1, $v0, .L8024056C -/* A57A08 80240558 24620001 */ addiu $v0, $v1, 1 -/* A57A0C 8024055C 24020001 */ addiu $v0, $zero, 1 -/* A57A10 80240560 AE220074 */ sw $v0, 0x74($s1) -/* A57A14 80240564 08090173 */ j .L802405CC -/* A57A18 80240568 AE20007C */ sw $zero, 0x7c($s1) -.L8024056C: -/* A57A1C 8024056C 08090173 */ j .L802405CC -/* A57A20 80240570 AE22007C */ sw $v0, 0x7c($s1) -.L80240574: -/* A57A24 80240574 C62C007C */ lwc1 $f12, 0x7c($s1) -/* A57A28 80240578 0C00A8D4 */ jal cos_deg -/* A57A2C 8024057C 46806320 */ cvt.s.w $f12, $f12 -/* A57A30 80240580 3C014040 */ lui $at, 0x4040 -/* A57A34 80240584 44811000 */ mtc1 $at, $f2 -/* A57A38 80240588 00000000 */ nop -/* A57A3C 8024058C 46020002 */ mul.s $f0, $f0, $f2 -/* A57A40 80240590 00000000 */ nop -/* A57A44 80240594 3C014188 */ lui $at, 0x4188 -/* A57A48 80240598 44812000 */ mtc1 $at, $f4 -/* A57A4C 8024059C C6220078 */ lwc1 $f2, 0x78($s1) -/* A57A50 802405A0 46041080 */ add.s $f2, $f2, $f4 -/* A57A54 802405A4 46001080 */ add.s $f2, $f2, $f0 -/* A57A58 802405A8 E642000C */ swc1 $f2, 0xc($s2) -/* A57A5C 802405AC 8E22007C */ lw $v0, 0x7c($s1) -/* A57A60 802405B0 24420009 */ addiu $v0, $v0, 9 -/* A57A64 802405B4 44826000 */ mtc1 $v0, $f12 -/* A57A68 802405B8 00000000 */ nop -/* A57A6C 802405BC 0C00A6C9 */ jal clamp_angle -/* A57A70 802405C0 46806320 */ cvt.s.w $f12, $f12 -/* A57A74 802405C4 4600018D */ trunc.w.s $f6, $f0 -/* A57A78 802405C8 E626007C */ swc1 $f6, 0x7c($s1) -.L802405CC: -/* A57A7C 802405CC 8FBF001C */ lw $ra, 0x1c($sp) -/* A57A80 802405D0 8FB20018 */ lw $s2, 0x18($sp) -/* A57A84 802405D4 8FB10014 */ lw $s1, 0x14($sp) -/* A57A88 802405D8 8FB00010 */ lw $s0, 0x10($sp) -/* A57A8C 802405DC 0000102D */ daddu $v0, $zero, $zero -/* A57A90 802405E0 03E00008 */ jr $ra -/* A57A94 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240428_A597B8.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240428_A597B8.s deleted file mode 100644 index 096399d671..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240428_A597B8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_A597B8 -/* A597B8 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A597BC 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* A597C0 80240430 0080882D */ daddu $s1, $a0, $zero -/* A597C4 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* A597C8 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* A597CC 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* A597D0 80240440 8E240084 */ lw $a0, 0x84($s1) -/* A597D4 80240444 0C04C3D6 */ jal get_item_entity -/* A597D8 80240448 00A0802D */ daddu $s0, $a1, $zero -/* A597DC 8024044C 12000005 */ beqz $s0, .L80240464 -/* A597E0 80240450 0040902D */ daddu $s2, $v0, $zero -/* A597E4 80240454 C640000C */ lwc1 $f0, 0xc($s2) -/* A597E8 80240458 AE200074 */ sw $zero, 0x74($s1) -/* A597EC 8024045C AE20007C */ sw $zero, 0x7c($s1) -/* A597F0 80240460 E6200078 */ swc1 $f0, 0x78($s1) -.L80240464: -/* A597F4 80240464 8E230074 */ lw $v1, 0x74($s1) -/* A597F8 80240468 10600005 */ beqz $v1, .L80240480 -/* A597FC 8024046C 24020001 */ addiu $v0, $zero, 1 -/* A59800 80240470 10620024 */ beq $v1, $v0, .L80240504 -/* A59804 80240474 00000000 */ nop -/* A59808 80240478 08090157 */ j .L8024055C -/* A5980C 8024047C 00000000 */ nop -.L80240480: -/* A59810 80240480 3C013FC9 */ lui $at, 0x3fc9 -/* A59814 80240484 34210FD8 */ ori $at, $at, 0xfd8 -/* A59818 80240488 44810000 */ mtc1 $at, $f0 -/* A5981C 8024048C C62C007C */ lwc1 $f12, 0x7c($s1) -/* A59820 80240490 46806320 */ cvt.s.w $f12, $f12 -/* A59824 80240494 46006302 */ mul.s $f12, $f12, $f0 -/* A59828 80240498 00000000 */ nop -/* A5982C 8024049C 3C0141F0 */ lui $at, 0x41f0 -/* A59830 802404A0 44810000 */ mtc1 $at, $f0 -/* A59834 802404A4 0C00A874 */ jal cos_rad -/* A59838 802404A8 46006303 */ div.s $f12, $f12, $f0 -/* A5983C 802404AC 3C013F80 */ lui $at, 0x3f80 -/* A59840 802404B0 44811000 */ mtc1 $at, $f2 -/* A59844 802404B4 00000000 */ nop -/* A59848 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* A5984C 802404BC 3C0141A0 */ lui $at, 0x41a0 -/* A59850 802404C0 44810000 */ mtc1 $at, $f0 -/* A59854 802404C4 00000000 */ nop -/* A59858 802404C8 46001082 */ mul.s $f2, $f2, $f0 -/* A5985C 802404CC 00000000 */ nop -/* A59860 802404D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* A59864 802404D4 46020000 */ add.s $f0, $f0, $f2 -/* A59868 802404D8 E640000C */ swc1 $f0, 0xc($s2) -/* A5986C 802404DC 8E23007C */ lw $v1, 0x7c($s1) -/* A59870 802404E0 2402001E */ addiu $v0, $zero, 0x1e -/* A59874 802404E4 14620005 */ bne $v1, $v0, .L802404FC -/* A59878 802404E8 24620001 */ addiu $v0, $v1, 1 -/* A5987C 802404EC 24020001 */ addiu $v0, $zero, 1 -/* A59880 802404F0 AE220074 */ sw $v0, 0x74($s1) -/* A59884 802404F4 08090157 */ j .L8024055C -/* A59888 802404F8 AE20007C */ sw $zero, 0x7c($s1) -.L802404FC: -/* A5988C 802404FC 08090157 */ j .L8024055C -/* A59890 80240500 AE22007C */ sw $v0, 0x7c($s1) -.L80240504: -/* A59894 80240504 C62C007C */ lwc1 $f12, 0x7c($s1) -/* A59898 80240508 0C00A8D4 */ jal cos_deg -/* A5989C 8024050C 46806320 */ cvt.s.w $f12, $f12 -/* A598A0 80240510 3C014040 */ lui $at, 0x4040 -/* A598A4 80240514 44811000 */ mtc1 $at, $f2 -/* A598A8 80240518 00000000 */ nop -/* A598AC 8024051C 46020002 */ mul.s $f0, $f0, $f2 -/* A598B0 80240520 00000000 */ nop -/* A598B4 80240524 3C014188 */ lui $at, 0x4188 -/* A598B8 80240528 44812000 */ mtc1 $at, $f4 -/* A598BC 8024052C C6220078 */ lwc1 $f2, 0x78($s1) -/* A598C0 80240530 46041080 */ add.s $f2, $f2, $f4 -/* A598C4 80240534 46001080 */ add.s $f2, $f2, $f0 -/* A598C8 80240538 E642000C */ swc1 $f2, 0xc($s2) -/* A598CC 8024053C 8E22007C */ lw $v0, 0x7c($s1) -/* A598D0 80240540 24420009 */ addiu $v0, $v0, 9 -/* A598D4 80240544 44826000 */ mtc1 $v0, $f12 -/* A598D8 80240548 00000000 */ nop -/* A598DC 8024054C 0C00A6C9 */ jal clamp_angle -/* A598E0 80240550 46806320 */ cvt.s.w $f12, $f12 -/* A598E4 80240554 4600018D */ trunc.w.s $f6, $f0 -/* A598E8 80240558 E626007C */ swc1 $f6, 0x7c($s1) -.L8024055C: -/* A598EC 8024055C 8FBF001C */ lw $ra, 0x1c($sp) -/* A598F0 80240560 8FB20018 */ lw $s2, 0x18($sp) -/* A598F4 80240564 8FB10014 */ lw $s1, 0x14($sp) -/* A598F8 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* A598FC 8024056C 0000102D */ daddu $v0, $zero, $zero -/* A59900 80240570 03E00008 */ jr $ra -/* A59904 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802408A8_C71D28.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802408A8_C71D28.s deleted file mode 100644 index 3c3f384527..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802408A8_C71D28.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A8_C71D28 -/* C71D28 802408A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C71D2C 802408AC AFB10014 */ sw $s1, 0x14($sp) -/* C71D30 802408B0 0080882D */ daddu $s1, $a0, $zero -/* C71D34 802408B4 AFBF001C */ sw $ra, 0x1c($sp) -/* C71D38 802408B8 AFB20018 */ sw $s2, 0x18($sp) -/* C71D3C 802408BC AFB00010 */ sw $s0, 0x10($sp) -/* C71D40 802408C0 8E240084 */ lw $a0, 0x84($s1) -/* C71D44 802408C4 0C04C3D6 */ jal get_item_entity -/* C71D48 802408C8 00A0802D */ daddu $s0, $a1, $zero -/* C71D4C 802408CC 12000005 */ beqz $s0, .L802408E4 -/* C71D50 802408D0 0040902D */ daddu $s2, $v0, $zero -/* C71D54 802408D4 C640000C */ lwc1 $f0, 0xc($s2) -/* C71D58 802408D8 AE200074 */ sw $zero, 0x74($s1) -/* C71D5C 802408DC AE20007C */ sw $zero, 0x7c($s1) -/* C71D60 802408E0 E6200078 */ swc1 $f0, 0x78($s1) -.L802408E4: -/* C71D64 802408E4 8E230074 */ lw $v1, 0x74($s1) -/* C71D68 802408E8 10600005 */ beqz $v1, .L80240900 -/* C71D6C 802408EC 24020001 */ addiu $v0, $zero, 1 -/* C71D70 802408F0 10620024 */ beq $v1, $v0, .L80240984 -/* C71D74 802408F4 00000000 */ nop -/* C71D78 802408F8 08090277 */ j .L802409DC -/* C71D7C 802408FC 00000000 */ nop -.L80240900: -/* C71D80 80240900 3C013FC9 */ lui $at, 0x3fc9 -/* C71D84 80240904 34210FD8 */ ori $at, $at, 0xfd8 -/* C71D88 80240908 44810000 */ mtc1 $at, $f0 -/* C71D8C 8024090C C62C007C */ lwc1 $f12, 0x7c($s1) -/* C71D90 80240910 46806320 */ cvt.s.w $f12, $f12 -/* C71D94 80240914 46006302 */ mul.s $f12, $f12, $f0 -/* C71D98 80240918 00000000 */ nop -/* C71D9C 8024091C 3C0141F0 */ lui $at, 0x41f0 -/* C71DA0 80240920 44810000 */ mtc1 $at, $f0 -/* C71DA4 80240924 0C00A874 */ jal cos_rad -/* C71DA8 80240928 46006303 */ div.s $f12, $f12, $f0 -/* C71DAC 8024092C 3C013F80 */ lui $at, 0x3f80 -/* C71DB0 80240930 44811000 */ mtc1 $at, $f2 -/* C71DB4 80240934 00000000 */ nop -/* C71DB8 80240938 46001081 */ sub.s $f2, $f2, $f0 -/* C71DBC 8024093C 3C0141A0 */ lui $at, 0x41a0 -/* C71DC0 80240940 44810000 */ mtc1 $at, $f0 -/* C71DC4 80240944 00000000 */ nop -/* C71DC8 80240948 46001082 */ mul.s $f2, $f2, $f0 -/* C71DCC 8024094C 00000000 */ nop -/* C71DD0 80240950 C6200078 */ lwc1 $f0, 0x78($s1) -/* C71DD4 80240954 46020000 */ add.s $f0, $f0, $f2 -/* C71DD8 80240958 E640000C */ swc1 $f0, 0xc($s2) -/* C71DDC 8024095C 8E23007C */ lw $v1, 0x7c($s1) -/* C71DE0 80240960 2402001E */ addiu $v0, $zero, 0x1e -/* C71DE4 80240964 14620005 */ bne $v1, $v0, .L8024097C -/* C71DE8 80240968 24620001 */ addiu $v0, $v1, 1 -/* C71DEC 8024096C 24020001 */ addiu $v0, $zero, 1 -/* C71DF0 80240970 AE220074 */ sw $v0, 0x74($s1) -/* C71DF4 80240974 08090277 */ j .L802409DC -/* C71DF8 80240978 AE20007C */ sw $zero, 0x7c($s1) -.L8024097C: -/* C71DFC 8024097C 08090277 */ j .L802409DC -/* C71E00 80240980 AE22007C */ sw $v0, 0x7c($s1) -.L80240984: -/* C71E04 80240984 C62C007C */ lwc1 $f12, 0x7c($s1) -/* C71E08 80240988 0C00A8D4 */ jal cos_deg -/* C71E0C 8024098C 46806320 */ cvt.s.w $f12, $f12 -/* C71E10 80240990 3C014040 */ lui $at, 0x4040 -/* C71E14 80240994 44811000 */ mtc1 $at, $f2 -/* C71E18 80240998 00000000 */ nop -/* C71E1C 8024099C 46020002 */ mul.s $f0, $f0, $f2 -/* C71E20 802409A0 00000000 */ nop -/* C71E24 802409A4 3C014188 */ lui $at, 0x4188 -/* C71E28 802409A8 44812000 */ mtc1 $at, $f4 -/* C71E2C 802409AC C6220078 */ lwc1 $f2, 0x78($s1) -/* C71E30 802409B0 46041080 */ add.s $f2, $f2, $f4 -/* C71E34 802409B4 46001080 */ add.s $f2, $f2, $f0 -/* C71E38 802409B8 E642000C */ swc1 $f2, 0xc($s2) -/* C71E3C 802409BC 8E22007C */ lw $v0, 0x7c($s1) -/* C71E40 802409C0 24420009 */ addiu $v0, $v0, 9 -/* C71E44 802409C4 44826000 */ mtc1 $v0, $f12 -/* C71E48 802409C8 00000000 */ nop -/* C71E4C 802409CC 0C00A6C9 */ jal clamp_angle -/* C71E50 802409D0 46806320 */ cvt.s.w $f12, $f12 -/* C71E54 802409D4 4600018D */ trunc.w.s $f6, $f0 -/* C71E58 802409D8 E626007C */ swc1 $f6, 0x7c($s1) -.L802409DC: -/* C71E5C 802409DC 8FBF001C */ lw $ra, 0x1c($sp) -/* C71E60 802409E0 8FB20018 */ lw $s2, 0x18($sp) -/* C71E64 802409E4 8FB10014 */ lw $s1, 0x14($sp) -/* C71E68 802409E8 8FB00010 */ lw $s0, 0x10($sp) -/* C71E6C 802409EC 0000102D */ daddu $v0, $zero, $zero -/* C71E70 802409F0 03E00008 */ jr $ra -/* C71E74 802409F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240118_BCED08.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240118_BCED08.s deleted file mode 100644 index 026c12a841..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240118_BCED08.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_BCED08 -/* BCED08 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCED0C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* BCED10 80240120 0080882D */ daddu $s1, $a0, $zero -/* BCED14 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* BCED18 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* BCED1C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* BCED20 80240130 8E240084 */ lw $a0, 0x84($s1) -/* BCED24 80240134 0C04C3D6 */ jal get_item_entity -/* BCED28 80240138 00A0802D */ daddu $s0, $a1, $zero -/* BCED2C 8024013C 12000005 */ beqz $s0, .L80240154 -/* BCED30 80240140 0040902D */ daddu $s2, $v0, $zero -/* BCED34 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* BCED38 80240148 AE200074 */ sw $zero, 0x74($s1) -/* BCED3C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* BCED40 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* BCED44 80240154 8E230074 */ lw $v1, 0x74($s1) -/* BCED48 80240158 10600005 */ beqz $v1, .L80240170 -/* BCED4C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* BCED50 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* BCED54 80240164 00000000 */ nop -/* BCED58 80240168 08090093 */ j .L8024024C -/* BCED5C 8024016C 00000000 */ nop -.L80240170: -/* BCED60 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* BCED64 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* BCED68 80240178 44810000 */ mtc1 $at, $f0 -/* BCED6C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* BCED70 80240180 46806320 */ cvt.s.w $f12, $f12 -/* BCED74 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* BCED78 80240188 00000000 */ nop -/* BCED7C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* BCED80 80240190 44810000 */ mtc1 $at, $f0 -/* BCED84 80240194 0C00A874 */ jal cos_rad -/* BCED88 80240198 46006303 */ div.s $f12, $f12, $f0 -/* BCED8C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* BCED90 802401A0 44811000 */ mtc1 $at, $f2 -/* BCED94 802401A4 00000000 */ nop -/* BCED98 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* BCED9C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* BCEDA0 802401B0 44810000 */ mtc1 $at, $f0 -/* BCEDA4 802401B4 00000000 */ nop -/* BCEDA8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* BCEDAC 802401BC 00000000 */ nop -/* BCEDB0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* BCEDB4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* BCEDB8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* BCEDBC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* BCEDC0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* BCEDC4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* BCEDC8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* BCEDCC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* BCEDD0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* BCEDD4 802401E4 08090093 */ j .L8024024C -/* BCEDD8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* BCEDDC 802401EC 08090093 */ j .L8024024C -/* BCEDE0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* BCEDE4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* BCEDE8 802401F8 0C00A8D4 */ jal cos_deg -/* BCEDEC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* BCEDF0 80240200 3C014040 */ lui $at, 0x4040 -/* BCEDF4 80240204 44811000 */ mtc1 $at, $f2 -/* BCEDF8 80240208 00000000 */ nop -/* BCEDFC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* BCEE00 80240210 00000000 */ nop -/* BCEE04 80240214 3C014188 */ lui $at, 0x4188 -/* BCEE08 80240218 44812000 */ mtc1 $at, $f4 -/* BCEE0C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* BCEE10 80240220 46041080 */ add.s $f2, $f2, $f4 -/* BCEE14 80240224 46001080 */ add.s $f2, $f2, $f0 -/* BCEE18 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* BCEE1C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* BCEE20 80240230 24420009 */ addiu $v0, $v0, 9 -/* BCEE24 80240234 44826000 */ mtc1 $v0, $f12 -/* BCEE28 80240238 00000000 */ nop -/* BCEE2C 8024023C 0C00A6C9 */ jal clamp_angle -/* BCEE30 80240240 46806320 */ cvt.s.w $f12, $f12 -/* BCEE34 80240244 4600018D */ trunc.w.s $f6, $f0 -/* BCEE38 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* BCEE3C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* BCEE40 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* BCEE44 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* BCEE48 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* BCEE4C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* BCEE50 80240260 03E00008 */ jr $ra -/* BCEE54 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240118_DAD518.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240118_DAD518.s deleted file mode 100644 index f1c252bc88..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240118_DAD518.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_DAD518 -/* DAD518 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAD51C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* DAD520 80240120 0080882D */ daddu $s1, $a0, $zero -/* DAD524 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* DAD528 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* DAD52C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* DAD530 80240130 8E240084 */ lw $a0, 0x84($s1) -/* DAD534 80240134 0C04C3D6 */ jal get_item_entity -/* DAD538 80240138 00A0802D */ daddu $s0, $a1, $zero -/* DAD53C 8024013C 12000005 */ beqz $s0, .L80240154 -/* DAD540 80240140 0040902D */ daddu $s2, $v0, $zero -/* DAD544 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* DAD548 80240148 AE200074 */ sw $zero, 0x74($s1) -/* DAD54C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* DAD550 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* DAD554 80240154 8E230074 */ lw $v1, 0x74($s1) -/* DAD558 80240158 10600005 */ beqz $v1, .L80240170 -/* DAD55C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* DAD560 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* DAD564 80240164 00000000 */ nop -/* DAD568 80240168 08090093 */ j .L8024024C -/* DAD56C 8024016C 00000000 */ nop -.L80240170: -/* DAD570 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* DAD574 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* DAD578 80240178 44810000 */ mtc1 $at, $f0 -/* DAD57C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* DAD580 80240180 46806320 */ cvt.s.w $f12, $f12 -/* DAD584 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* DAD588 80240188 00000000 */ nop -/* DAD58C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* DAD590 80240190 44810000 */ mtc1 $at, $f0 -/* DAD594 80240194 0C00A874 */ jal cos_rad -/* DAD598 80240198 46006303 */ div.s $f12, $f12, $f0 -/* DAD59C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* DAD5A0 802401A0 44811000 */ mtc1 $at, $f2 -/* DAD5A4 802401A4 00000000 */ nop -/* DAD5A8 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* DAD5AC 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* DAD5B0 802401B0 44810000 */ mtc1 $at, $f0 -/* DAD5B4 802401B4 00000000 */ nop -/* DAD5B8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* DAD5BC 802401BC 00000000 */ nop -/* DAD5C0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DAD5C4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* DAD5C8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* DAD5CC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* DAD5D0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* DAD5D4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* DAD5D8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* DAD5DC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* DAD5E0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* DAD5E4 802401E4 08090093 */ j .L8024024C -/* DAD5E8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* DAD5EC 802401EC 08090093 */ j .L8024024C -/* DAD5F0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* DAD5F4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DAD5F8 802401F8 0C00A8D4 */ jal cos_deg -/* DAD5FC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* DAD600 80240200 3C014040 */ lui $at, 0x4040 -/* DAD604 80240204 44811000 */ mtc1 $at, $f2 -/* DAD608 80240208 00000000 */ nop -/* DAD60C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* DAD610 80240210 00000000 */ nop -/* DAD614 80240214 3C014188 */ lui $at, 0x4188 -/* DAD618 80240218 44812000 */ mtc1 $at, $f4 -/* DAD61C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* DAD620 80240220 46041080 */ add.s $f2, $f2, $f4 -/* DAD624 80240224 46001080 */ add.s $f2, $f2, $f0 -/* DAD628 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* DAD62C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* DAD630 80240230 24420009 */ addiu $v0, $v0, 9 -/* DAD634 80240234 44826000 */ mtc1 $v0, $f12 -/* DAD638 80240238 00000000 */ nop -/* DAD63C 8024023C 0C00A6C9 */ jal clamp_angle -/* DAD640 80240240 46806320 */ cvt.s.w $f12, $f12 -/* DAD644 80240244 4600018D */ trunc.w.s $f6, $f0 -/* DAD648 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* DAD64C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* DAD650 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* DAD654 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* DAD658 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* DAD65C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* DAD660 80240260 03E00008 */ jr $ra -/* DAD664 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s deleted file mode 100644 index 245e633602..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240988_DB8298 -/* DB8298 80240988 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB829C 8024098C AFB10014 */ sw $s1, 0x14($sp) -/* DB82A0 80240990 0080882D */ daddu $s1, $a0, $zero -/* DB82A4 80240994 AFBF001C */ sw $ra, 0x1c($sp) -/* DB82A8 80240998 AFB20018 */ sw $s2, 0x18($sp) -/* DB82AC 8024099C AFB00010 */ sw $s0, 0x10($sp) -/* DB82B0 802409A0 8E240084 */ lw $a0, 0x84($s1) -/* DB82B4 802409A4 0C04C3D6 */ jal get_item_entity -/* DB82B8 802409A8 00A0802D */ daddu $s0, $a1, $zero -/* DB82BC 802409AC 12000005 */ beqz $s0, .L802409C4 -/* DB82C0 802409B0 0040902D */ daddu $s2, $v0, $zero -/* DB82C4 802409B4 C640000C */ lwc1 $f0, 0xc($s2) -/* DB82C8 802409B8 AE200074 */ sw $zero, 0x74($s1) -/* DB82CC 802409BC AE20007C */ sw $zero, 0x7c($s1) -/* DB82D0 802409C0 E6200078 */ swc1 $f0, 0x78($s1) -.L802409C4: -/* DB82D4 802409C4 8E230074 */ lw $v1, 0x74($s1) -/* DB82D8 802409C8 10600005 */ beqz $v1, .L802409E0 -/* DB82DC 802409CC 24020001 */ addiu $v0, $zero, 1 -/* DB82E0 802409D0 10620024 */ beq $v1, $v0, .L80240A64 -/* DB82E4 802409D4 00000000 */ nop -/* DB82E8 802409D8 080902AF */ j .L80240ABC -/* DB82EC 802409DC 00000000 */ nop -.L802409E0: -/* DB82F0 802409E0 3C013FC9 */ lui $at, 0x3fc9 -/* DB82F4 802409E4 34210FD8 */ ori $at, $at, 0xfd8 -/* DB82F8 802409E8 44810000 */ mtc1 $at, $f0 -/* DB82FC 802409EC C62C007C */ lwc1 $f12, 0x7c($s1) -/* DB8300 802409F0 46806320 */ cvt.s.w $f12, $f12 -/* DB8304 802409F4 46006302 */ mul.s $f12, $f12, $f0 -/* DB8308 802409F8 00000000 */ nop -/* DB830C 802409FC 3C0141F0 */ lui $at, 0x41f0 -/* DB8310 80240A00 44810000 */ mtc1 $at, $f0 -/* DB8314 80240A04 0C00A874 */ jal cos_rad -/* DB8318 80240A08 46006303 */ div.s $f12, $f12, $f0 -/* DB831C 80240A0C 3C013F80 */ lui $at, 0x3f80 -/* DB8320 80240A10 44811000 */ mtc1 $at, $f2 -/* DB8324 80240A14 00000000 */ nop -/* DB8328 80240A18 46001081 */ sub.s $f2, $f2, $f0 -/* DB832C 80240A1C 3C0141A0 */ lui $at, 0x41a0 -/* DB8330 80240A20 44810000 */ mtc1 $at, $f0 -/* DB8334 80240A24 00000000 */ nop -/* DB8338 80240A28 46001082 */ mul.s $f2, $f2, $f0 -/* DB833C 80240A2C 00000000 */ nop -/* DB8340 80240A30 C6200078 */ lwc1 $f0, 0x78($s1) -/* DB8344 80240A34 46020000 */ add.s $f0, $f0, $f2 -/* DB8348 80240A38 E640000C */ swc1 $f0, 0xc($s2) -/* DB834C 80240A3C 8E23007C */ lw $v1, 0x7c($s1) -/* DB8350 80240A40 2402001E */ addiu $v0, $zero, 0x1e -/* DB8354 80240A44 14620005 */ bne $v1, $v0, .L80240A5C -/* DB8358 80240A48 24620001 */ addiu $v0, $v1, 1 -/* DB835C 80240A4C 24020001 */ addiu $v0, $zero, 1 -/* DB8360 80240A50 AE220074 */ sw $v0, 0x74($s1) -/* DB8364 80240A54 080902AF */ j .L80240ABC -/* DB8368 80240A58 AE20007C */ sw $zero, 0x7c($s1) -.L80240A5C: -/* DB836C 80240A5C 080902AF */ j .L80240ABC -/* DB8370 80240A60 AE22007C */ sw $v0, 0x7c($s1) -.L80240A64: -/* DB8374 80240A64 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DB8378 80240A68 0C00A8D4 */ jal cos_deg -/* DB837C 80240A6C 46806320 */ cvt.s.w $f12, $f12 -/* DB8380 80240A70 3C014040 */ lui $at, 0x4040 -/* DB8384 80240A74 44811000 */ mtc1 $at, $f2 -/* DB8388 80240A78 00000000 */ nop -/* DB838C 80240A7C 46020002 */ mul.s $f0, $f0, $f2 -/* DB8390 80240A80 00000000 */ nop -/* DB8394 80240A84 3C014188 */ lui $at, 0x4188 -/* DB8398 80240A88 44812000 */ mtc1 $at, $f4 -/* DB839C 80240A8C C6220078 */ lwc1 $f2, 0x78($s1) -/* DB83A0 80240A90 46041080 */ add.s $f2, $f2, $f4 -/* DB83A4 80240A94 46001080 */ add.s $f2, $f2, $f0 -/* DB83A8 80240A98 E642000C */ swc1 $f2, 0xc($s2) -/* DB83AC 80240A9C 8E22007C */ lw $v0, 0x7c($s1) -/* DB83B0 80240AA0 24420009 */ addiu $v0, $v0, 9 -/* DB83B4 80240AA4 44826000 */ mtc1 $v0, $f12 -/* DB83B8 80240AA8 00000000 */ nop -/* DB83BC 80240AAC 0C00A6C9 */ jal clamp_angle -/* DB83C0 80240AB0 46806320 */ cvt.s.w $f12, $f12 -/* DB83C4 80240AB4 4600018D */ trunc.w.s $f6, $f0 -/* DB83C8 80240AB8 E626007C */ swc1 $f6, 0x7c($s1) -.L80240ABC: -/* DB83CC 80240ABC 8FBF001C */ lw $ra, 0x1c($sp) -/* DB83D0 80240AC0 8FB20018 */ lw $s2, 0x18($sp) -/* DB83D4 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* DB83D8 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* DB83DC 80240ACC 0000102D */ daddu $v0, $zero, $zero -/* DB83E0 80240AD0 03E00008 */ jr $ra -/* DB83E4 80240AD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s deleted file mode 100644 index b43cb60a89..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243038_DC02E8 -/* DC02E8 80243038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC02EC 8024303C AFB10014 */ sw $s1, 0x14($sp) -/* DC02F0 80243040 0080882D */ daddu $s1, $a0, $zero -/* DC02F4 80243044 AFBF001C */ sw $ra, 0x1c($sp) -/* DC02F8 80243048 AFB20018 */ sw $s2, 0x18($sp) -/* DC02FC 8024304C AFB00010 */ sw $s0, 0x10($sp) -/* DC0300 80243050 8E240084 */ lw $a0, 0x84($s1) -/* DC0304 80243054 0C04C3D6 */ jal get_item_entity -/* DC0308 80243058 00A0802D */ daddu $s0, $a1, $zero -/* DC030C 8024305C 12000005 */ beqz $s0, .L80243074 -/* DC0310 80243060 0040902D */ daddu $s2, $v0, $zero -/* DC0314 80243064 C640000C */ lwc1 $f0, 0xc($s2) -/* DC0318 80243068 AE200074 */ sw $zero, 0x74($s1) -/* DC031C 8024306C AE20007C */ sw $zero, 0x7c($s1) -/* DC0320 80243070 E6200078 */ swc1 $f0, 0x78($s1) -.L80243074: -/* DC0324 80243074 8E230074 */ lw $v1, 0x74($s1) -/* DC0328 80243078 10600005 */ beqz $v1, .L80243090 -/* DC032C 8024307C 24020001 */ addiu $v0, $zero, 1 -/* DC0330 80243080 10620024 */ beq $v1, $v0, .L80243114 -/* DC0334 80243084 00000000 */ nop -/* DC0338 80243088 08090C5B */ j .L8024316C -/* DC033C 8024308C 00000000 */ nop -.L80243090: -/* DC0340 80243090 3C013FC9 */ lui $at, 0x3fc9 -/* DC0344 80243094 34210FD8 */ ori $at, $at, 0xfd8 -/* DC0348 80243098 44810000 */ mtc1 $at, $f0 -/* DC034C 8024309C C62C007C */ lwc1 $f12, 0x7c($s1) -/* DC0350 802430A0 46806320 */ cvt.s.w $f12, $f12 -/* DC0354 802430A4 46006302 */ mul.s $f12, $f12, $f0 -/* DC0358 802430A8 00000000 */ nop -/* DC035C 802430AC 3C0141F0 */ lui $at, 0x41f0 -/* DC0360 802430B0 44810000 */ mtc1 $at, $f0 -/* DC0364 802430B4 0C00A874 */ jal cos_rad -/* DC0368 802430B8 46006303 */ div.s $f12, $f12, $f0 -/* DC036C 802430BC 3C013F80 */ lui $at, 0x3f80 -/* DC0370 802430C0 44811000 */ mtc1 $at, $f2 -/* DC0374 802430C4 00000000 */ nop -/* DC0378 802430C8 46001081 */ sub.s $f2, $f2, $f0 -/* DC037C 802430CC 3C0141A0 */ lui $at, 0x41a0 -/* DC0380 802430D0 44810000 */ mtc1 $at, $f0 -/* DC0384 802430D4 00000000 */ nop -/* DC0388 802430D8 46001082 */ mul.s $f2, $f2, $f0 -/* DC038C 802430DC 00000000 */ nop -/* DC0390 802430E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DC0394 802430E4 46020000 */ add.s $f0, $f0, $f2 -/* DC0398 802430E8 E640000C */ swc1 $f0, 0xc($s2) -/* DC039C 802430EC 8E23007C */ lw $v1, 0x7c($s1) -/* DC03A0 802430F0 2402001E */ addiu $v0, $zero, 0x1e -/* DC03A4 802430F4 14620005 */ bne $v1, $v0, .L8024310C -/* DC03A8 802430F8 24620001 */ addiu $v0, $v1, 1 -/* DC03AC 802430FC 24020001 */ addiu $v0, $zero, 1 -/* DC03B0 80243100 AE220074 */ sw $v0, 0x74($s1) -/* DC03B4 80243104 08090C5B */ j .L8024316C -/* DC03B8 80243108 AE20007C */ sw $zero, 0x7c($s1) -.L8024310C: -/* DC03BC 8024310C 08090C5B */ j .L8024316C -/* DC03C0 80243110 AE22007C */ sw $v0, 0x7c($s1) -.L80243114: -/* DC03C4 80243114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DC03C8 80243118 0C00A8D4 */ jal cos_deg -/* DC03CC 8024311C 46806320 */ cvt.s.w $f12, $f12 -/* DC03D0 80243120 3C014040 */ lui $at, 0x4040 -/* DC03D4 80243124 44811000 */ mtc1 $at, $f2 -/* DC03D8 80243128 00000000 */ nop -/* DC03DC 8024312C 46020002 */ mul.s $f0, $f0, $f2 -/* DC03E0 80243130 00000000 */ nop -/* DC03E4 80243134 3C014188 */ lui $at, 0x4188 -/* DC03E8 80243138 44812000 */ mtc1 $at, $f4 -/* DC03EC 8024313C C6220078 */ lwc1 $f2, 0x78($s1) -/* DC03F0 80243140 46041080 */ add.s $f2, $f2, $f4 -/* DC03F4 80243144 46001080 */ add.s $f2, $f2, $f0 -/* DC03F8 80243148 E642000C */ swc1 $f2, 0xc($s2) -/* DC03FC 8024314C 8E22007C */ lw $v0, 0x7c($s1) -/* DC0400 80243150 24420009 */ addiu $v0, $v0, 9 -/* DC0404 80243154 44826000 */ mtc1 $v0, $f12 -/* DC0408 80243158 00000000 */ nop -/* DC040C 8024315C 0C00A6C9 */ jal clamp_angle -/* DC0410 80243160 46806320 */ cvt.s.w $f12, $f12 -/* DC0414 80243164 4600018D */ trunc.w.s $f6, $f0 -/* DC0418 80243168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024316C: -/* DC041C 8024316C 8FBF001C */ lw $ra, 0x1c($sp) -/* DC0420 80243170 8FB20018 */ lw $s2, 0x18($sp) -/* DC0424 80243174 8FB10014 */ lw $s1, 0x14($sp) -/* DC0428 80243178 8FB00010 */ lw $s0, 0x10($sp) -/* DC042C 8024317C 0000102D */ daddu $v0, $zero, $zero -/* DC0430 80243180 03E00008 */ jr $ra -/* DC0434 80243184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s deleted file mode 100644 index 09e72f96c4..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240838_DCD508 -/* DCD508 80240838 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD50C 8024083C AFB10014 */ sw $s1, 0x14($sp) -/* DCD510 80240840 0080882D */ daddu $s1, $a0, $zero -/* DCD514 80240844 AFBF001C */ sw $ra, 0x1c($sp) -/* DCD518 80240848 AFB20018 */ sw $s2, 0x18($sp) -/* DCD51C 8024084C AFB00010 */ sw $s0, 0x10($sp) -/* DCD520 80240850 8E240084 */ lw $a0, 0x84($s1) -/* DCD524 80240854 0C04C3D6 */ jal get_item_entity -/* DCD528 80240858 00A0802D */ daddu $s0, $a1, $zero -/* DCD52C 8024085C 12000005 */ beqz $s0, .L80240874 -/* DCD530 80240860 0040902D */ daddu $s2, $v0, $zero -/* DCD534 80240864 C640000C */ lwc1 $f0, 0xc($s2) -/* DCD538 80240868 AE200074 */ sw $zero, 0x74($s1) -/* DCD53C 8024086C AE20007C */ sw $zero, 0x7c($s1) -/* DCD540 80240870 E6200078 */ swc1 $f0, 0x78($s1) -.L80240874: -/* DCD544 80240874 8E230074 */ lw $v1, 0x74($s1) -/* DCD548 80240878 10600005 */ beqz $v1, .L80240890 -/* DCD54C 8024087C 24020001 */ addiu $v0, $zero, 1 -/* DCD550 80240880 10620024 */ beq $v1, $v0, .L80240914 -/* DCD554 80240884 00000000 */ nop -/* DCD558 80240888 0809025B */ j .L8024096C -/* DCD55C 8024088C 00000000 */ nop -.L80240890: -/* DCD560 80240890 3C013FC9 */ lui $at, 0x3fc9 -/* DCD564 80240894 34210FD8 */ ori $at, $at, 0xfd8 -/* DCD568 80240898 44810000 */ mtc1 $at, $f0 -/* DCD56C 8024089C C62C007C */ lwc1 $f12, 0x7c($s1) -/* DCD570 802408A0 46806320 */ cvt.s.w $f12, $f12 -/* DCD574 802408A4 46006302 */ mul.s $f12, $f12, $f0 -/* DCD578 802408A8 00000000 */ nop -/* DCD57C 802408AC 3C0141F0 */ lui $at, 0x41f0 -/* DCD580 802408B0 44810000 */ mtc1 $at, $f0 -/* DCD584 802408B4 0C00A874 */ jal cos_rad -/* DCD588 802408B8 46006303 */ div.s $f12, $f12, $f0 -/* DCD58C 802408BC 3C013F80 */ lui $at, 0x3f80 -/* DCD590 802408C0 44811000 */ mtc1 $at, $f2 -/* DCD594 802408C4 00000000 */ nop -/* DCD598 802408C8 46001081 */ sub.s $f2, $f2, $f0 -/* DCD59C 802408CC 3C0141A0 */ lui $at, 0x41a0 -/* DCD5A0 802408D0 44810000 */ mtc1 $at, $f0 -/* DCD5A4 802408D4 00000000 */ nop -/* DCD5A8 802408D8 46001082 */ mul.s $f2, $f2, $f0 -/* DCD5AC 802408DC 00000000 */ nop -/* DCD5B0 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DCD5B4 802408E4 46020000 */ add.s $f0, $f0, $f2 -/* DCD5B8 802408E8 E640000C */ swc1 $f0, 0xc($s2) -/* DCD5BC 802408EC 8E23007C */ lw $v1, 0x7c($s1) -/* DCD5C0 802408F0 2402001E */ addiu $v0, $zero, 0x1e -/* DCD5C4 802408F4 14620005 */ bne $v1, $v0, .L8024090C -/* DCD5C8 802408F8 24620001 */ addiu $v0, $v1, 1 -/* DCD5CC 802408FC 24020001 */ addiu $v0, $zero, 1 -/* DCD5D0 80240900 AE220074 */ sw $v0, 0x74($s1) -/* DCD5D4 80240904 0809025B */ j .L8024096C -/* DCD5D8 80240908 AE20007C */ sw $zero, 0x7c($s1) -.L8024090C: -/* DCD5DC 8024090C 0809025B */ j .L8024096C -/* DCD5E0 80240910 AE22007C */ sw $v0, 0x7c($s1) -.L80240914: -/* DCD5E4 80240914 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DCD5E8 80240918 0C00A8D4 */ jal cos_deg -/* DCD5EC 8024091C 46806320 */ cvt.s.w $f12, $f12 -/* DCD5F0 80240920 3C014040 */ lui $at, 0x4040 -/* DCD5F4 80240924 44811000 */ mtc1 $at, $f2 -/* DCD5F8 80240928 00000000 */ nop -/* DCD5FC 8024092C 46020002 */ mul.s $f0, $f0, $f2 -/* DCD600 80240930 00000000 */ nop -/* DCD604 80240934 3C014188 */ lui $at, 0x4188 -/* DCD608 80240938 44812000 */ mtc1 $at, $f4 -/* DCD60C 8024093C C6220078 */ lwc1 $f2, 0x78($s1) -/* DCD610 80240940 46041080 */ add.s $f2, $f2, $f4 -/* DCD614 80240944 46001080 */ add.s $f2, $f2, $f0 -/* DCD618 80240948 E642000C */ swc1 $f2, 0xc($s2) -/* DCD61C 8024094C 8E22007C */ lw $v0, 0x7c($s1) -/* DCD620 80240950 24420009 */ addiu $v0, $v0, 9 -/* DCD624 80240954 44826000 */ mtc1 $v0, $f12 -/* DCD628 80240958 00000000 */ nop -/* DCD62C 8024095C 0C00A6C9 */ jal clamp_angle -/* DCD630 80240960 46806320 */ cvt.s.w $f12, $f12 -/* DCD634 80240964 4600018D */ trunc.w.s $f6, $f0 -/* DCD638 80240968 E626007C */ swc1 $f6, 0x7c($s1) -.L8024096C: -/* DCD63C 8024096C 8FBF001C */ lw $ra, 0x1c($sp) -/* DCD640 80240970 8FB20018 */ lw $s2, 0x18($sp) -/* DCD644 80240974 8FB10014 */ lw $s1, 0x14($sp) -/* DCD648 80240978 8FB00010 */ lw $s0, 0x10($sp) -/* DCD64C 8024097C 0000102D */ daddu $v0, $zero, $zero -/* DCD650 80240980 03E00008 */ jr $ra -/* DCD654 80240984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s deleted file mode 100644 index 50c5cc4781..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241348_DE37D8 -/* DE37D8 80241348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE37DC 8024134C AFB10014 */ sw $s1, 0x14($sp) -/* DE37E0 80241350 0080882D */ daddu $s1, $a0, $zero -/* DE37E4 80241354 AFBF001C */ sw $ra, 0x1c($sp) -/* DE37E8 80241358 AFB20018 */ sw $s2, 0x18($sp) -/* DE37EC 8024135C AFB00010 */ sw $s0, 0x10($sp) -/* DE37F0 80241360 8E240084 */ lw $a0, 0x84($s1) -/* DE37F4 80241364 0C04C3D6 */ jal get_item_entity -/* DE37F8 80241368 00A0802D */ daddu $s0, $a1, $zero -/* DE37FC 8024136C 12000005 */ beqz $s0, .L80241384 -/* DE3800 80241370 0040902D */ daddu $s2, $v0, $zero -/* DE3804 80241374 C640000C */ lwc1 $f0, 0xc($s2) -/* DE3808 80241378 AE200074 */ sw $zero, 0x74($s1) -/* DE380C 8024137C AE20007C */ sw $zero, 0x7c($s1) -/* DE3810 80241380 E6200078 */ swc1 $f0, 0x78($s1) -.L80241384: -/* DE3814 80241384 8E230074 */ lw $v1, 0x74($s1) -/* DE3818 80241388 10600005 */ beqz $v1, .L802413A0 -/* DE381C 8024138C 24020001 */ addiu $v0, $zero, 1 -/* DE3820 80241390 10620024 */ beq $v1, $v0, .L80241424 -/* DE3824 80241394 00000000 */ nop -/* DE3828 80241398 0809051F */ j .L8024147C -/* DE382C 8024139C 00000000 */ nop -.L802413A0: -/* DE3830 802413A0 3C013FC9 */ lui $at, 0x3fc9 -/* DE3834 802413A4 34210FD8 */ ori $at, $at, 0xfd8 -/* DE3838 802413A8 44810000 */ mtc1 $at, $f0 -/* DE383C 802413AC C62C007C */ lwc1 $f12, 0x7c($s1) -/* DE3840 802413B0 46806320 */ cvt.s.w $f12, $f12 -/* DE3844 802413B4 46006302 */ mul.s $f12, $f12, $f0 -/* DE3848 802413B8 00000000 */ nop -/* DE384C 802413BC 3C0141F0 */ lui $at, 0x41f0 -/* DE3850 802413C0 44810000 */ mtc1 $at, $f0 -/* DE3854 802413C4 0C00A874 */ jal cos_rad -/* DE3858 802413C8 46006303 */ div.s $f12, $f12, $f0 -/* DE385C 802413CC 3C013F80 */ lui $at, 0x3f80 -/* DE3860 802413D0 44811000 */ mtc1 $at, $f2 -/* DE3864 802413D4 00000000 */ nop -/* DE3868 802413D8 46001081 */ sub.s $f2, $f2, $f0 -/* DE386C 802413DC 3C0141A0 */ lui $at, 0x41a0 -/* DE3870 802413E0 44810000 */ mtc1 $at, $f0 -/* DE3874 802413E4 00000000 */ nop -/* DE3878 802413E8 46001082 */ mul.s $f2, $f2, $f0 -/* DE387C 802413EC 00000000 */ nop -/* DE3880 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DE3884 802413F4 46020000 */ add.s $f0, $f0, $f2 -/* DE3888 802413F8 E640000C */ swc1 $f0, 0xc($s2) -/* DE388C 802413FC 8E23007C */ lw $v1, 0x7c($s1) -/* DE3890 80241400 2402001E */ addiu $v0, $zero, 0x1e -/* DE3894 80241404 14620005 */ bne $v1, $v0, .L8024141C -/* DE3898 80241408 24620001 */ addiu $v0, $v1, 1 -/* DE389C 8024140C 24020001 */ addiu $v0, $zero, 1 -/* DE38A0 80241410 AE220074 */ sw $v0, 0x74($s1) -/* DE38A4 80241414 0809051F */ j .L8024147C -/* DE38A8 80241418 AE20007C */ sw $zero, 0x7c($s1) -.L8024141C: -/* DE38AC 8024141C 0809051F */ j .L8024147C -/* DE38B0 80241420 AE22007C */ sw $v0, 0x7c($s1) -.L80241424: -/* DE38B4 80241424 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DE38B8 80241428 0C00A8D4 */ jal cos_deg -/* DE38BC 8024142C 46806320 */ cvt.s.w $f12, $f12 -/* DE38C0 80241430 3C014040 */ lui $at, 0x4040 -/* DE38C4 80241434 44811000 */ mtc1 $at, $f2 -/* DE38C8 80241438 00000000 */ nop -/* DE38CC 8024143C 46020002 */ mul.s $f0, $f0, $f2 -/* DE38D0 80241440 00000000 */ nop -/* DE38D4 80241444 3C014188 */ lui $at, 0x4188 -/* DE38D8 80241448 44812000 */ mtc1 $at, $f4 -/* DE38DC 8024144C C6220078 */ lwc1 $f2, 0x78($s1) -/* DE38E0 80241450 46041080 */ add.s $f2, $f2, $f4 -/* DE38E4 80241454 46001080 */ add.s $f2, $f2, $f0 -/* DE38E8 80241458 E642000C */ swc1 $f2, 0xc($s2) -/* DE38EC 8024145C 8E22007C */ lw $v0, 0x7c($s1) -/* DE38F0 80241460 24420009 */ addiu $v0, $v0, 9 -/* DE38F4 80241464 44826000 */ mtc1 $v0, $f12 -/* DE38F8 80241468 00000000 */ nop -/* DE38FC 8024146C 0C00A6C9 */ jal clamp_angle -/* DE3900 80241470 46806320 */ cvt.s.w $f12, $f12 -/* DE3904 80241474 4600018D */ trunc.w.s $f6, $f0 -/* DE3908 80241478 E626007C */ swc1 $f6, 0x7c($s1) -.L8024147C: -/* DE390C 8024147C 8FBF001C */ lw $ra, 0x1c($sp) -/* DE3910 80241480 8FB20018 */ lw $s2, 0x18($sp) -/* DE3914 80241484 8FB10014 */ lw $s1, 0x14($sp) -/* DE3918 80241488 8FB00010 */ lw $s0, 0x10($sp) -/* DE391C 8024148C 0000102D */ daddu $v0, $zero, $zero -/* DE3920 80241490 03E00008 */ jr $ra -/* DE3924 80241494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241038_D56BE8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241038_D56BE8.s deleted file mode 100644 index b357bf6367..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241038_D56BE8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241038_D56BE8 -/* D56BE8 80241038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D56BEC 8024103C AFB10014 */ sw $s1, 0x14($sp) -/* D56BF0 80241040 0080882D */ daddu $s1, $a0, $zero -/* D56BF4 80241044 AFBF001C */ sw $ra, 0x1c($sp) -/* D56BF8 80241048 AFB20018 */ sw $s2, 0x18($sp) -/* D56BFC 8024104C AFB00010 */ sw $s0, 0x10($sp) -/* D56C00 80241050 8E240084 */ lw $a0, 0x84($s1) -/* D56C04 80241054 0C04C3D6 */ jal get_item_entity -/* D56C08 80241058 00A0802D */ daddu $s0, $a1, $zero -/* D56C0C 8024105C 12000005 */ beqz $s0, .L80241074 -/* D56C10 80241060 0040902D */ daddu $s2, $v0, $zero -/* D56C14 80241064 C640000C */ lwc1 $f0, 0xc($s2) -/* D56C18 80241068 AE200074 */ sw $zero, 0x74($s1) -/* D56C1C 8024106C AE20007C */ sw $zero, 0x7c($s1) -/* D56C20 80241070 E6200078 */ swc1 $f0, 0x78($s1) -.L80241074: -/* D56C24 80241074 8E230074 */ lw $v1, 0x74($s1) -/* D56C28 80241078 10600005 */ beqz $v1, .L80241090 -/* D56C2C 8024107C 24020001 */ addiu $v0, $zero, 1 -/* D56C30 80241080 10620024 */ beq $v1, $v0, .L80241114 -/* D56C34 80241084 00000000 */ nop -/* D56C38 80241088 0809045B */ j .L8024116C -/* D56C3C 8024108C 00000000 */ nop -.L80241090: -/* D56C40 80241090 3C013FC9 */ lui $at, 0x3fc9 -/* D56C44 80241094 34210FD8 */ ori $at, $at, 0xfd8 -/* D56C48 80241098 44810000 */ mtc1 $at, $f0 -/* D56C4C 8024109C C62C007C */ lwc1 $f12, 0x7c($s1) -/* D56C50 802410A0 46806320 */ cvt.s.w $f12, $f12 -/* D56C54 802410A4 46006302 */ mul.s $f12, $f12, $f0 -/* D56C58 802410A8 00000000 */ nop -/* D56C5C 802410AC 3C0141F0 */ lui $at, 0x41f0 -/* D56C60 802410B0 44810000 */ mtc1 $at, $f0 -/* D56C64 802410B4 0C00A874 */ jal cos_rad -/* D56C68 802410B8 46006303 */ div.s $f12, $f12, $f0 -/* D56C6C 802410BC 3C013F80 */ lui $at, 0x3f80 -/* D56C70 802410C0 44811000 */ mtc1 $at, $f2 -/* D56C74 802410C4 00000000 */ nop -/* D56C78 802410C8 46001081 */ sub.s $f2, $f2, $f0 -/* D56C7C 802410CC 3C0141A0 */ lui $at, 0x41a0 -/* D56C80 802410D0 44810000 */ mtc1 $at, $f0 -/* D56C84 802410D4 00000000 */ nop -/* D56C88 802410D8 46001082 */ mul.s $f2, $f2, $f0 -/* D56C8C 802410DC 00000000 */ nop -/* D56C90 802410E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* D56C94 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* D56C98 802410E8 E640000C */ swc1 $f0, 0xc($s2) -/* D56C9C 802410EC 8E23007C */ lw $v1, 0x7c($s1) -/* D56CA0 802410F0 2402001E */ addiu $v0, $zero, 0x1e -/* D56CA4 802410F4 14620005 */ bne $v1, $v0, .L8024110C -/* D56CA8 802410F8 24620001 */ addiu $v0, $v1, 1 -/* D56CAC 802410FC 24020001 */ addiu $v0, $zero, 1 -/* D56CB0 80241100 AE220074 */ sw $v0, 0x74($s1) -/* D56CB4 80241104 0809045B */ j .L8024116C -/* D56CB8 80241108 AE20007C */ sw $zero, 0x7c($s1) -.L8024110C: -/* D56CBC 8024110C 0809045B */ j .L8024116C -/* D56CC0 80241110 AE22007C */ sw $v0, 0x7c($s1) -.L80241114: -/* D56CC4 80241114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D56CC8 80241118 0C00A8D4 */ jal cos_deg -/* D56CCC 8024111C 46806320 */ cvt.s.w $f12, $f12 -/* D56CD0 80241120 3C014040 */ lui $at, 0x4040 -/* D56CD4 80241124 44811000 */ mtc1 $at, $f2 -/* D56CD8 80241128 00000000 */ nop -/* D56CDC 8024112C 46020002 */ mul.s $f0, $f0, $f2 -/* D56CE0 80241130 00000000 */ nop -/* D56CE4 80241134 3C014188 */ lui $at, 0x4188 -/* D56CE8 80241138 44812000 */ mtc1 $at, $f4 -/* D56CEC 8024113C C6220078 */ lwc1 $f2, 0x78($s1) -/* D56CF0 80241140 46041080 */ add.s $f2, $f2, $f4 -/* D56CF4 80241144 46001080 */ add.s $f2, $f2, $f0 -/* D56CF8 80241148 E642000C */ swc1 $f2, 0xc($s2) -/* D56CFC 8024114C 8E22007C */ lw $v0, 0x7c($s1) -/* D56D00 80241150 24420009 */ addiu $v0, $v0, 9 -/* D56D04 80241154 44826000 */ mtc1 $v0, $f12 -/* D56D08 80241158 00000000 */ nop -/* D56D0C 8024115C 0C00A6C9 */ jal clamp_angle -/* D56D10 80241160 46806320 */ cvt.s.w $f12, $f12 -/* D56D14 80241164 4600018D */ trunc.w.s $f6, $f0 -/* D56D18 80241168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024116C: -/* D56D1C 8024116C 8FBF001C */ lw $ra, 0x1c($sp) -/* D56D20 80241170 8FB20018 */ lw $s2, 0x18($sp) -/* D56D24 80241174 8FB10014 */ lw $s1, 0x14($sp) -/* D56D28 80241178 8FB00010 */ lw $s0, 0x10($sp) -/* D56D2C 8024117C 0000102D */ daddu $v0, $zero, $zero -/* D56D30 80241180 03E00008 */ jr $ra -/* D56D34 80241184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241038_D62538.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241038_D62538.s deleted file mode 100644 index 7f8fab66e1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241038_D62538.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241038_D62538 -/* D62538 80241038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D6253C 8024103C AFB10014 */ sw $s1, 0x14($sp) -/* D62540 80241040 0080882D */ daddu $s1, $a0, $zero -/* D62544 80241044 AFBF001C */ sw $ra, 0x1c($sp) -/* D62548 80241048 AFB20018 */ sw $s2, 0x18($sp) -/* D6254C 8024104C AFB00010 */ sw $s0, 0x10($sp) -/* D62550 80241050 8E240084 */ lw $a0, 0x84($s1) -/* D62554 80241054 0C04C3D6 */ jal get_item_entity -/* D62558 80241058 00A0802D */ daddu $s0, $a1, $zero -/* D6255C 8024105C 12000005 */ beqz $s0, .L80241074 -/* D62560 80241060 0040902D */ daddu $s2, $v0, $zero -/* D62564 80241064 C640000C */ lwc1 $f0, 0xc($s2) -/* D62568 80241068 AE200074 */ sw $zero, 0x74($s1) -/* D6256C 8024106C AE20007C */ sw $zero, 0x7c($s1) -/* D62570 80241070 E6200078 */ swc1 $f0, 0x78($s1) -.L80241074: -/* D62574 80241074 8E230074 */ lw $v1, 0x74($s1) -/* D62578 80241078 10600005 */ beqz $v1, .L80241090 -/* D6257C 8024107C 24020001 */ addiu $v0, $zero, 1 -/* D62580 80241080 10620024 */ beq $v1, $v0, .L80241114 -/* D62584 80241084 00000000 */ nop -/* D62588 80241088 0809045B */ j .L8024116C -/* D6258C 8024108C 00000000 */ nop -.L80241090: -/* D62590 80241090 3C013FC9 */ lui $at, 0x3fc9 -/* D62594 80241094 34210FD8 */ ori $at, $at, 0xfd8 -/* D62598 80241098 44810000 */ mtc1 $at, $f0 -/* D6259C 8024109C C62C007C */ lwc1 $f12, 0x7c($s1) -/* D625A0 802410A0 46806320 */ cvt.s.w $f12, $f12 -/* D625A4 802410A4 46006302 */ mul.s $f12, $f12, $f0 -/* D625A8 802410A8 00000000 */ nop -/* D625AC 802410AC 3C0141F0 */ lui $at, 0x41f0 -/* D625B0 802410B0 44810000 */ mtc1 $at, $f0 -/* D625B4 802410B4 0C00A874 */ jal cos_rad -/* D625B8 802410B8 46006303 */ div.s $f12, $f12, $f0 -/* D625BC 802410BC 3C013F80 */ lui $at, 0x3f80 -/* D625C0 802410C0 44811000 */ mtc1 $at, $f2 -/* D625C4 802410C4 00000000 */ nop -/* D625C8 802410C8 46001081 */ sub.s $f2, $f2, $f0 -/* D625CC 802410CC 3C0141A0 */ lui $at, 0x41a0 -/* D625D0 802410D0 44810000 */ mtc1 $at, $f0 -/* D625D4 802410D4 00000000 */ nop -/* D625D8 802410D8 46001082 */ mul.s $f2, $f2, $f0 -/* D625DC 802410DC 00000000 */ nop -/* D625E0 802410E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* D625E4 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* D625E8 802410E8 E640000C */ swc1 $f0, 0xc($s2) -/* D625EC 802410EC 8E23007C */ lw $v1, 0x7c($s1) -/* D625F0 802410F0 2402001E */ addiu $v0, $zero, 0x1e -/* D625F4 802410F4 14620005 */ bne $v1, $v0, .L8024110C -/* D625F8 802410F8 24620001 */ addiu $v0, $v1, 1 -/* D625FC 802410FC 24020001 */ addiu $v0, $zero, 1 -/* D62600 80241100 AE220074 */ sw $v0, 0x74($s1) -/* D62604 80241104 0809045B */ j .L8024116C -/* D62608 80241108 AE20007C */ sw $zero, 0x7c($s1) -.L8024110C: -/* D6260C 8024110C 0809045B */ j .L8024116C -/* D62610 80241110 AE22007C */ sw $v0, 0x7c($s1) -.L80241114: -/* D62614 80241114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D62618 80241118 0C00A8D4 */ jal cos_deg -/* D6261C 8024111C 46806320 */ cvt.s.w $f12, $f12 -/* D62620 80241120 3C014040 */ lui $at, 0x4040 -/* D62624 80241124 44811000 */ mtc1 $at, $f2 -/* D62628 80241128 00000000 */ nop -/* D6262C 8024112C 46020002 */ mul.s $f0, $f0, $f2 -/* D62630 80241130 00000000 */ nop -/* D62634 80241134 3C014188 */ lui $at, 0x4188 -/* D62638 80241138 44812000 */ mtc1 $at, $f4 -/* D6263C 8024113C C6220078 */ lwc1 $f2, 0x78($s1) -/* D62640 80241140 46041080 */ add.s $f2, $f2, $f4 -/* D62644 80241144 46001080 */ add.s $f2, $f2, $f0 -/* D62648 80241148 E642000C */ swc1 $f2, 0xc($s2) -/* D6264C 8024114C 8E22007C */ lw $v0, 0x7c($s1) -/* D62650 80241150 24420009 */ addiu $v0, $v0, 9 -/* D62654 80241154 44826000 */ mtc1 $v0, $f12 -/* D62658 80241158 00000000 */ nop -/* D6265C 8024115C 0C00A6C9 */ jal clamp_angle -/* D62660 80241160 46806320 */ cvt.s.w $f12, $f12 -/* D62664 80241164 4600018D */ trunc.w.s $f6, $f0 -/* D62668 80241168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024116C: -/* D6266C 8024116C 8FBF001C */ lw $ra, 0x1c($sp) -/* D62670 80241170 8FB20018 */ lw $s2, 0x18($sp) -/* D62674 80241174 8FB10014 */ lw $s1, 0x14($sp) -/* D62678 80241178 8FB00010 */ lw $s0, 0x10($sp) -/* D6267C 8024117C 0000102D */ daddu $v0, $zero, $zero -/* D62680 80241180 03E00008 */ jr $ra -/* D62684 80241184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241068_D63D78.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241068_D63D78.s deleted file mode 100644 index aec247ffb6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241068_D63D78.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241068_D63D78 -/* D63D78 80241068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D63D7C 8024106C AFB10014 */ sw $s1, 0x14($sp) -/* D63D80 80241070 0080882D */ daddu $s1, $a0, $zero -/* D63D84 80241074 AFBF001C */ sw $ra, 0x1c($sp) -/* D63D88 80241078 AFB20018 */ sw $s2, 0x18($sp) -/* D63D8C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* D63D90 80241080 8E240084 */ lw $a0, 0x84($s1) -/* D63D94 80241084 0C04C3D6 */ jal get_item_entity -/* D63D98 80241088 00A0802D */ daddu $s0, $a1, $zero -/* D63D9C 8024108C 12000005 */ beqz $s0, .L802410A4 -/* D63DA0 80241090 0040902D */ daddu $s2, $v0, $zero -/* D63DA4 80241094 C640000C */ lwc1 $f0, 0xc($s2) -/* D63DA8 80241098 AE200074 */ sw $zero, 0x74($s1) -/* D63DAC 8024109C AE20007C */ sw $zero, 0x7c($s1) -/* D63DB0 802410A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802410A4: -/* D63DB4 802410A4 8E230074 */ lw $v1, 0x74($s1) -/* D63DB8 802410A8 10600005 */ beqz $v1, .L802410C0 -/* D63DBC 802410AC 24020001 */ addiu $v0, $zero, 1 -/* D63DC0 802410B0 10620024 */ beq $v1, $v0, .L80241144 -/* D63DC4 802410B4 00000000 */ nop -/* D63DC8 802410B8 08090467 */ j .L8024119C -/* D63DCC 802410BC 00000000 */ nop -.L802410C0: -/* D63DD0 802410C0 3C013FC9 */ lui $at, 0x3fc9 -/* D63DD4 802410C4 34210FD8 */ ori $at, $at, 0xfd8 -/* D63DD8 802410C8 44810000 */ mtc1 $at, $f0 -/* D63DDC 802410CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D63DE0 802410D0 46806320 */ cvt.s.w $f12, $f12 -/* D63DE4 802410D4 46006302 */ mul.s $f12, $f12, $f0 -/* D63DE8 802410D8 00000000 */ nop -/* D63DEC 802410DC 3C0141F0 */ lui $at, 0x41f0 -/* D63DF0 802410E0 44810000 */ mtc1 $at, $f0 -/* D63DF4 802410E4 0C00A874 */ jal cos_rad -/* D63DF8 802410E8 46006303 */ div.s $f12, $f12, $f0 -/* D63DFC 802410EC 3C013F80 */ lui $at, 0x3f80 -/* D63E00 802410F0 44811000 */ mtc1 $at, $f2 -/* D63E04 802410F4 00000000 */ nop -/* D63E08 802410F8 46001081 */ sub.s $f2, $f2, $f0 -/* D63E0C 802410FC 3C0141A0 */ lui $at, 0x41a0 -/* D63E10 80241100 44810000 */ mtc1 $at, $f0 -/* D63E14 80241104 00000000 */ nop -/* D63E18 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* D63E1C 8024110C 00000000 */ nop -/* D63E20 80241110 C6200078 */ lwc1 $f0, 0x78($s1) -/* D63E24 80241114 46020000 */ add.s $f0, $f0, $f2 -/* D63E28 80241118 E640000C */ swc1 $f0, 0xc($s2) -/* D63E2C 8024111C 8E23007C */ lw $v1, 0x7c($s1) -/* D63E30 80241120 2402001E */ addiu $v0, $zero, 0x1e -/* D63E34 80241124 14620005 */ bne $v1, $v0, .L8024113C -/* D63E38 80241128 24620001 */ addiu $v0, $v1, 1 -/* D63E3C 8024112C 24020001 */ addiu $v0, $zero, 1 -/* D63E40 80241130 AE220074 */ sw $v0, 0x74($s1) -/* D63E44 80241134 08090467 */ j .L8024119C -/* D63E48 80241138 AE20007C */ sw $zero, 0x7c($s1) -.L8024113C: -/* D63E4C 8024113C 08090467 */ j .L8024119C -/* D63E50 80241140 AE22007C */ sw $v0, 0x7c($s1) -.L80241144: -/* D63E54 80241144 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D63E58 80241148 0C00A8D4 */ jal cos_deg -/* D63E5C 8024114C 46806320 */ cvt.s.w $f12, $f12 -/* D63E60 80241150 3C014040 */ lui $at, 0x4040 -/* D63E64 80241154 44811000 */ mtc1 $at, $f2 -/* D63E68 80241158 00000000 */ nop -/* D63E6C 8024115C 46020002 */ mul.s $f0, $f0, $f2 -/* D63E70 80241160 00000000 */ nop -/* D63E74 80241164 3C014188 */ lui $at, 0x4188 -/* D63E78 80241168 44812000 */ mtc1 $at, $f4 -/* D63E7C 8024116C C6220078 */ lwc1 $f2, 0x78($s1) -/* D63E80 80241170 46041080 */ add.s $f2, $f2, $f4 -/* D63E84 80241174 46001080 */ add.s $f2, $f2, $f0 -/* D63E88 80241178 E642000C */ swc1 $f2, 0xc($s2) -/* D63E8C 8024117C 8E22007C */ lw $v0, 0x7c($s1) -/* D63E90 80241180 24420009 */ addiu $v0, $v0, 9 -/* D63E94 80241184 44826000 */ mtc1 $v0, $f12 -/* D63E98 80241188 00000000 */ nop -/* D63E9C 8024118C 0C00A6C9 */ jal clamp_angle -/* D63EA0 80241190 46806320 */ cvt.s.w $f12, $f12 -/* D63EA4 80241194 4600018D */ trunc.w.s $f6, $f0 -/* D63EA8 80241198 E626007C */ swc1 $f6, 0x7c($s1) -.L8024119C: -/* D63EAC 8024119C 8FBF001C */ lw $ra, 0x1c($sp) -/* D63EB0 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* D63EB4 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* D63EB8 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* D63EBC 802411AC 0000102D */ daddu $v0, $zero, $zero -/* D63EC0 802411B0 03E00008 */ jr $ra -/* D63EC4 802411B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241038_D68D38.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241038_D68D38.s deleted file mode 100644 index afe81421c0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241038_D68D38.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241038_D68D38 -/* D68D38 80241038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D68D3C 8024103C AFB10014 */ sw $s1, 0x14($sp) -/* D68D40 80241040 0080882D */ daddu $s1, $a0, $zero -/* D68D44 80241044 AFBF001C */ sw $ra, 0x1c($sp) -/* D68D48 80241048 AFB20018 */ sw $s2, 0x18($sp) -/* D68D4C 8024104C AFB00010 */ sw $s0, 0x10($sp) -/* D68D50 80241050 8E240084 */ lw $a0, 0x84($s1) -/* D68D54 80241054 0C04C3D6 */ jal get_item_entity -/* D68D58 80241058 00A0802D */ daddu $s0, $a1, $zero -/* D68D5C 8024105C 12000005 */ beqz $s0, .L80241074 -/* D68D60 80241060 0040902D */ daddu $s2, $v0, $zero -/* D68D64 80241064 C640000C */ lwc1 $f0, 0xc($s2) -/* D68D68 80241068 AE200074 */ sw $zero, 0x74($s1) -/* D68D6C 8024106C AE20007C */ sw $zero, 0x7c($s1) -/* D68D70 80241070 E6200078 */ swc1 $f0, 0x78($s1) -.L80241074: -/* D68D74 80241074 8E230074 */ lw $v1, 0x74($s1) -/* D68D78 80241078 10600005 */ beqz $v1, .L80241090 -/* D68D7C 8024107C 24020001 */ addiu $v0, $zero, 1 -/* D68D80 80241080 10620024 */ beq $v1, $v0, .L80241114 -/* D68D84 80241084 00000000 */ nop -/* D68D88 80241088 0809045B */ j .L8024116C -/* D68D8C 8024108C 00000000 */ nop -.L80241090: -/* D68D90 80241090 3C013FC9 */ lui $at, 0x3fc9 -/* D68D94 80241094 34210FD8 */ ori $at, $at, 0xfd8 -/* D68D98 80241098 44810000 */ mtc1 $at, $f0 -/* D68D9C 8024109C C62C007C */ lwc1 $f12, 0x7c($s1) -/* D68DA0 802410A0 46806320 */ cvt.s.w $f12, $f12 -/* D68DA4 802410A4 46006302 */ mul.s $f12, $f12, $f0 -/* D68DA8 802410A8 00000000 */ nop -/* D68DAC 802410AC 3C0141F0 */ lui $at, 0x41f0 -/* D68DB0 802410B0 44810000 */ mtc1 $at, $f0 -/* D68DB4 802410B4 0C00A874 */ jal cos_rad -/* D68DB8 802410B8 46006303 */ div.s $f12, $f12, $f0 -/* D68DBC 802410BC 3C013F80 */ lui $at, 0x3f80 -/* D68DC0 802410C0 44811000 */ mtc1 $at, $f2 -/* D68DC4 802410C4 00000000 */ nop -/* D68DC8 802410C8 46001081 */ sub.s $f2, $f2, $f0 -/* D68DCC 802410CC 3C0141A0 */ lui $at, 0x41a0 -/* D68DD0 802410D0 44810000 */ mtc1 $at, $f0 -/* D68DD4 802410D4 00000000 */ nop -/* D68DD8 802410D8 46001082 */ mul.s $f2, $f2, $f0 -/* D68DDC 802410DC 00000000 */ nop -/* D68DE0 802410E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* D68DE4 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* D68DE8 802410E8 E640000C */ swc1 $f0, 0xc($s2) -/* D68DEC 802410EC 8E23007C */ lw $v1, 0x7c($s1) -/* D68DF0 802410F0 2402001E */ addiu $v0, $zero, 0x1e -/* D68DF4 802410F4 14620005 */ bne $v1, $v0, .L8024110C -/* D68DF8 802410F8 24620001 */ addiu $v0, $v1, 1 -/* D68DFC 802410FC 24020001 */ addiu $v0, $zero, 1 -/* D68E00 80241100 AE220074 */ sw $v0, 0x74($s1) -/* D68E04 80241104 0809045B */ j .L8024116C -/* D68E08 80241108 AE20007C */ sw $zero, 0x7c($s1) -.L8024110C: -/* D68E0C 8024110C 0809045B */ j .L8024116C -/* D68E10 80241110 AE22007C */ sw $v0, 0x7c($s1) -.L80241114: -/* D68E14 80241114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D68E18 80241118 0C00A8D4 */ jal cos_deg -/* D68E1C 8024111C 46806320 */ cvt.s.w $f12, $f12 -/* D68E20 80241120 3C014040 */ lui $at, 0x4040 -/* D68E24 80241124 44811000 */ mtc1 $at, $f2 -/* D68E28 80241128 00000000 */ nop -/* D68E2C 8024112C 46020002 */ mul.s $f0, $f0, $f2 -/* D68E30 80241130 00000000 */ nop -/* D68E34 80241134 3C014188 */ lui $at, 0x4188 -/* D68E38 80241138 44812000 */ mtc1 $at, $f4 -/* D68E3C 8024113C C6220078 */ lwc1 $f2, 0x78($s1) -/* D68E40 80241140 46041080 */ add.s $f2, $f2, $f4 -/* D68E44 80241144 46001080 */ add.s $f2, $f2, $f0 -/* D68E48 80241148 E642000C */ swc1 $f2, 0xc($s2) -/* D68E4C 8024114C 8E22007C */ lw $v0, 0x7c($s1) -/* D68E50 80241150 24420009 */ addiu $v0, $v0, 9 -/* D68E54 80241154 44826000 */ mtc1 $v0, $f12 -/* D68E58 80241158 00000000 */ nop -/* D68E5C 8024115C 0C00A6C9 */ jal clamp_angle -/* D68E60 80241160 46806320 */ cvt.s.w $f12, $f12 -/* D68E64 80241164 4600018D */ trunc.w.s $f6, $f0 -/* D68E68 80241168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024116C: -/* D68E6C 8024116C 8FBF001C */ lw $ra, 0x1c($sp) -/* D68E70 80241170 8FB20018 */ lw $s2, 0x18($sp) -/* D68E74 80241174 8FB10014 */ lw $s1, 0x14($sp) -/* D68E78 80241178 8FB00010 */ lw $s0, 0x10($sp) -/* D68E7C 8024117C 0000102D */ daddu $v0, $zero, $zero -/* D68E80 80241180 03E00008 */ jr $ra -/* D68E84 80241184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241068_D7AA58.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241068_D7AA58.s deleted file mode 100644 index c783874814..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241068_D7AA58.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241068_D7AA58 -/* D7AA58 80241068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7AA5C 8024106C AFB10014 */ sw $s1, 0x14($sp) -/* D7AA60 80241070 0080882D */ daddu $s1, $a0, $zero -/* D7AA64 80241074 AFBF001C */ sw $ra, 0x1c($sp) -/* D7AA68 80241078 AFB20018 */ sw $s2, 0x18($sp) -/* D7AA6C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* D7AA70 80241080 8E240084 */ lw $a0, 0x84($s1) -/* D7AA74 80241084 0C04C3D6 */ jal get_item_entity -/* D7AA78 80241088 00A0802D */ daddu $s0, $a1, $zero -/* D7AA7C 8024108C 12000005 */ beqz $s0, .L802410A4 -/* D7AA80 80241090 0040902D */ daddu $s2, $v0, $zero -/* D7AA84 80241094 C640000C */ lwc1 $f0, 0xc($s2) -/* D7AA88 80241098 AE200074 */ sw $zero, 0x74($s1) -/* D7AA8C 8024109C AE20007C */ sw $zero, 0x7c($s1) -/* D7AA90 802410A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802410A4: -/* D7AA94 802410A4 8E230074 */ lw $v1, 0x74($s1) -/* D7AA98 802410A8 10600005 */ beqz $v1, .L802410C0 -/* D7AA9C 802410AC 24020001 */ addiu $v0, $zero, 1 -/* D7AAA0 802410B0 10620024 */ beq $v1, $v0, .L80241144 -/* D7AAA4 802410B4 00000000 */ nop -/* D7AAA8 802410B8 08090467 */ j .L8024119C -/* D7AAAC 802410BC 00000000 */ nop -.L802410C0: -/* D7AAB0 802410C0 3C013FC9 */ lui $at, 0x3fc9 -/* D7AAB4 802410C4 34210FD8 */ ori $at, $at, 0xfd8 -/* D7AAB8 802410C8 44810000 */ mtc1 $at, $f0 -/* D7AABC 802410CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D7AAC0 802410D0 46806320 */ cvt.s.w $f12, $f12 -/* D7AAC4 802410D4 46006302 */ mul.s $f12, $f12, $f0 -/* D7AAC8 802410D8 00000000 */ nop -/* D7AACC 802410DC 3C0141F0 */ lui $at, 0x41f0 -/* D7AAD0 802410E0 44810000 */ mtc1 $at, $f0 -/* D7AAD4 802410E4 0C00A874 */ jal cos_rad -/* D7AAD8 802410E8 46006303 */ div.s $f12, $f12, $f0 -/* D7AADC 802410EC 3C013F80 */ lui $at, 0x3f80 -/* D7AAE0 802410F0 44811000 */ mtc1 $at, $f2 -/* D7AAE4 802410F4 00000000 */ nop -/* D7AAE8 802410F8 46001081 */ sub.s $f2, $f2, $f0 -/* D7AAEC 802410FC 3C0141A0 */ lui $at, 0x41a0 -/* D7AAF0 80241100 44810000 */ mtc1 $at, $f0 -/* D7AAF4 80241104 00000000 */ nop -/* D7AAF8 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* D7AAFC 8024110C 00000000 */ nop -/* D7AB00 80241110 C6200078 */ lwc1 $f0, 0x78($s1) -/* D7AB04 80241114 46020000 */ add.s $f0, $f0, $f2 -/* D7AB08 80241118 E640000C */ swc1 $f0, 0xc($s2) -/* D7AB0C 8024111C 8E23007C */ lw $v1, 0x7c($s1) -/* D7AB10 80241120 2402001E */ addiu $v0, $zero, 0x1e -/* D7AB14 80241124 14620005 */ bne $v1, $v0, .L8024113C -/* D7AB18 80241128 24620001 */ addiu $v0, $v1, 1 -/* D7AB1C 8024112C 24020001 */ addiu $v0, $zero, 1 -/* D7AB20 80241130 AE220074 */ sw $v0, 0x74($s1) -/* D7AB24 80241134 08090467 */ j .L8024119C -/* D7AB28 80241138 AE20007C */ sw $zero, 0x7c($s1) -.L8024113C: -/* D7AB2C 8024113C 08090467 */ j .L8024119C -/* D7AB30 80241140 AE22007C */ sw $v0, 0x7c($s1) -.L80241144: -/* D7AB34 80241144 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D7AB38 80241148 0C00A8D4 */ jal cos_deg -/* D7AB3C 8024114C 46806320 */ cvt.s.w $f12, $f12 -/* D7AB40 80241150 3C014040 */ lui $at, 0x4040 -/* D7AB44 80241154 44811000 */ mtc1 $at, $f2 -/* D7AB48 80241158 00000000 */ nop -/* D7AB4C 8024115C 46020002 */ mul.s $f0, $f0, $f2 -/* D7AB50 80241160 00000000 */ nop -/* D7AB54 80241164 3C014188 */ lui $at, 0x4188 -/* D7AB58 80241168 44812000 */ mtc1 $at, $f4 -/* D7AB5C 8024116C C6220078 */ lwc1 $f2, 0x78($s1) -/* D7AB60 80241170 46041080 */ add.s $f2, $f2, $f4 -/* D7AB64 80241174 46001080 */ add.s $f2, $f2, $f0 -/* D7AB68 80241178 E642000C */ swc1 $f2, 0xc($s2) -/* D7AB6C 8024117C 8E22007C */ lw $v0, 0x7c($s1) -/* D7AB70 80241180 24420009 */ addiu $v0, $v0, 9 -/* D7AB74 80241184 44826000 */ mtc1 $v0, $f12 -/* D7AB78 80241188 00000000 */ nop -/* D7AB7C 8024118C 0C00A6C9 */ jal clamp_angle -/* D7AB80 80241190 46806320 */ cvt.s.w $f12, $f12 -/* D7AB84 80241194 4600018D */ trunc.w.s $f6, $f0 -/* D7AB88 80241198 E626007C */ swc1 $f6, 0x7c($s1) -.L8024119C: -/* D7AB8C 8024119C 8FBF001C */ lw $ra, 0x1c($sp) -/* D7AB90 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* D7AB94 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* D7AB98 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* D7AB9C 802411AC 0000102D */ daddu $v0, $zero, $zero -/* D7ABA0 802411B0 03E00008 */ jr $ra -/* D7ABA4 802411B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241068_D7C308.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241068_D7C308.s deleted file mode 100644 index 6fe8b6229a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241068_D7C308.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241068_D7C308 -/* D7C308 80241068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7C30C 8024106C AFB10014 */ sw $s1, 0x14($sp) -/* D7C310 80241070 0080882D */ daddu $s1, $a0, $zero -/* D7C314 80241074 AFBF001C */ sw $ra, 0x1c($sp) -/* D7C318 80241078 AFB20018 */ sw $s2, 0x18($sp) -/* D7C31C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* D7C320 80241080 8E240084 */ lw $a0, 0x84($s1) -/* D7C324 80241084 0C04C3D6 */ jal get_item_entity -/* D7C328 80241088 00A0802D */ daddu $s0, $a1, $zero -/* D7C32C 8024108C 12000005 */ beqz $s0, .L802410A4 -/* D7C330 80241090 0040902D */ daddu $s2, $v0, $zero -/* D7C334 80241094 C640000C */ lwc1 $f0, 0xc($s2) -/* D7C338 80241098 AE200074 */ sw $zero, 0x74($s1) -/* D7C33C 8024109C AE20007C */ sw $zero, 0x7c($s1) -/* D7C340 802410A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802410A4: -/* D7C344 802410A4 8E230074 */ lw $v1, 0x74($s1) -/* D7C348 802410A8 10600005 */ beqz $v1, .L802410C0 -/* D7C34C 802410AC 24020001 */ addiu $v0, $zero, 1 -/* D7C350 802410B0 10620024 */ beq $v1, $v0, .L80241144 -/* D7C354 802410B4 00000000 */ nop -/* D7C358 802410B8 08090467 */ j .L8024119C -/* D7C35C 802410BC 00000000 */ nop -.L802410C0: -/* D7C360 802410C0 3C013FC9 */ lui $at, 0x3fc9 -/* D7C364 802410C4 34210FD8 */ ori $at, $at, 0xfd8 -/* D7C368 802410C8 44810000 */ mtc1 $at, $f0 -/* D7C36C 802410CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D7C370 802410D0 46806320 */ cvt.s.w $f12, $f12 -/* D7C374 802410D4 46006302 */ mul.s $f12, $f12, $f0 -/* D7C378 802410D8 00000000 */ nop -/* D7C37C 802410DC 3C0141F0 */ lui $at, 0x41f0 -/* D7C380 802410E0 44810000 */ mtc1 $at, $f0 -/* D7C384 802410E4 0C00A874 */ jal cos_rad -/* D7C388 802410E8 46006303 */ div.s $f12, $f12, $f0 -/* D7C38C 802410EC 3C013F80 */ lui $at, 0x3f80 -/* D7C390 802410F0 44811000 */ mtc1 $at, $f2 -/* D7C394 802410F4 00000000 */ nop -/* D7C398 802410F8 46001081 */ sub.s $f2, $f2, $f0 -/* D7C39C 802410FC 3C0141A0 */ lui $at, 0x41a0 -/* D7C3A0 80241100 44810000 */ mtc1 $at, $f0 -/* D7C3A4 80241104 00000000 */ nop -/* D7C3A8 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* D7C3AC 8024110C 00000000 */ nop -/* D7C3B0 80241110 C6200078 */ lwc1 $f0, 0x78($s1) -/* D7C3B4 80241114 46020000 */ add.s $f0, $f0, $f2 -/* D7C3B8 80241118 E640000C */ swc1 $f0, 0xc($s2) -/* D7C3BC 8024111C 8E23007C */ lw $v1, 0x7c($s1) -/* D7C3C0 80241120 2402001E */ addiu $v0, $zero, 0x1e -/* D7C3C4 80241124 14620005 */ bne $v1, $v0, .L8024113C -/* D7C3C8 80241128 24620001 */ addiu $v0, $v1, 1 -/* D7C3CC 8024112C 24020001 */ addiu $v0, $zero, 1 -/* D7C3D0 80241130 AE220074 */ sw $v0, 0x74($s1) -/* D7C3D4 80241134 08090467 */ j .L8024119C -/* D7C3D8 80241138 AE20007C */ sw $zero, 0x7c($s1) -.L8024113C: -/* D7C3DC 8024113C 08090467 */ j .L8024119C -/* D7C3E0 80241140 AE22007C */ sw $v0, 0x7c($s1) -.L80241144: -/* D7C3E4 80241144 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D7C3E8 80241148 0C00A8D4 */ jal cos_deg -/* D7C3EC 8024114C 46806320 */ cvt.s.w $f12, $f12 -/* D7C3F0 80241150 3C014040 */ lui $at, 0x4040 -/* D7C3F4 80241154 44811000 */ mtc1 $at, $f2 -/* D7C3F8 80241158 00000000 */ nop -/* D7C3FC 8024115C 46020002 */ mul.s $f0, $f0, $f2 -/* D7C400 80241160 00000000 */ nop -/* D7C404 80241164 3C014188 */ lui $at, 0x4188 -/* D7C408 80241168 44812000 */ mtc1 $at, $f4 -/* D7C40C 8024116C C6220078 */ lwc1 $f2, 0x78($s1) -/* D7C410 80241170 46041080 */ add.s $f2, $f2, $f4 -/* D7C414 80241174 46001080 */ add.s $f2, $f2, $f0 -/* D7C418 80241178 E642000C */ swc1 $f2, 0xc($s2) -/* D7C41C 8024117C 8E22007C */ lw $v0, 0x7c($s1) -/* D7C420 80241180 24420009 */ addiu $v0, $v0, 9 -/* D7C424 80241184 44826000 */ mtc1 $v0, $f12 -/* D7C428 80241188 00000000 */ nop -/* D7C42C 8024118C 0C00A6C9 */ jal clamp_angle -/* D7C430 80241190 46806320 */ cvt.s.w $f12, $f12 -/* D7C434 80241194 4600018D */ trunc.w.s $f6, $f0 -/* D7C438 80241198 E626007C */ swc1 $f6, 0x7c($s1) -.L8024119C: -/* D7C43C 8024119C 8FBF001C */ lw $ra, 0x1c($sp) -/* D7C440 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* D7C444 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* D7C448 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* D7C44C 802411AC 0000102D */ daddu $v0, $zero, $zero -/* D7C450 802411B0 03E00008 */ jr $ra -/* D7C454 802411B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s deleted file mode 100644 index 36788f7f01..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A68_D8FCB8 -/* D8FCB8 80242A68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8FCBC 80242A6C AFB10014 */ sw $s1, 0x14($sp) -/* D8FCC0 80242A70 0080882D */ daddu $s1, $a0, $zero -/* D8FCC4 80242A74 AFBF001C */ sw $ra, 0x1c($sp) -/* D8FCC8 80242A78 AFB20018 */ sw $s2, 0x18($sp) -/* D8FCCC 80242A7C AFB00010 */ sw $s0, 0x10($sp) -/* D8FCD0 80242A80 8E240084 */ lw $a0, 0x84($s1) -/* D8FCD4 80242A84 0C04C3D6 */ jal get_item_entity -/* D8FCD8 80242A88 00A0802D */ daddu $s0, $a1, $zero -/* D8FCDC 80242A8C 12000005 */ beqz $s0, .L80242AA4 -/* D8FCE0 80242A90 0040902D */ daddu $s2, $v0, $zero -/* D8FCE4 80242A94 C640000C */ lwc1 $f0, 0xc($s2) -/* D8FCE8 80242A98 AE200074 */ sw $zero, 0x74($s1) -/* D8FCEC 80242A9C AE20007C */ sw $zero, 0x7c($s1) -/* D8FCF0 80242AA0 E6200078 */ swc1 $f0, 0x78($s1) -.L80242AA4: -/* D8FCF4 80242AA4 8E230074 */ lw $v1, 0x74($s1) -/* D8FCF8 80242AA8 10600005 */ beqz $v1, .L80242AC0 -/* D8FCFC 80242AAC 24020001 */ addiu $v0, $zero, 1 -/* D8FD00 80242AB0 10620024 */ beq $v1, $v0, .L80242B44 -/* D8FD04 80242AB4 00000000 */ nop -/* D8FD08 80242AB8 08090AE7 */ j .L80242B9C -/* D8FD0C 80242ABC 00000000 */ nop -.L80242AC0: -/* D8FD10 80242AC0 3C013FC9 */ lui $at, 0x3fc9 -/* D8FD14 80242AC4 34210FD8 */ ori $at, $at, 0xfd8 -/* D8FD18 80242AC8 44810000 */ mtc1 $at, $f0 -/* D8FD1C 80242ACC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D8FD20 80242AD0 46806320 */ cvt.s.w $f12, $f12 -/* D8FD24 80242AD4 46006302 */ mul.s $f12, $f12, $f0 -/* D8FD28 80242AD8 00000000 */ nop -/* D8FD2C 80242ADC 3C0141F0 */ lui $at, 0x41f0 -/* D8FD30 80242AE0 44810000 */ mtc1 $at, $f0 -/* D8FD34 80242AE4 0C00A874 */ jal cos_rad -/* D8FD38 80242AE8 46006303 */ div.s $f12, $f12, $f0 -/* D8FD3C 80242AEC 3C013F80 */ lui $at, 0x3f80 -/* D8FD40 80242AF0 44811000 */ mtc1 $at, $f2 -/* D8FD44 80242AF4 00000000 */ nop -/* D8FD48 80242AF8 46001081 */ sub.s $f2, $f2, $f0 -/* D8FD4C 80242AFC 3C0141A0 */ lui $at, 0x41a0 -/* D8FD50 80242B00 44810000 */ mtc1 $at, $f0 -/* D8FD54 80242B04 00000000 */ nop -/* D8FD58 80242B08 46001082 */ mul.s $f2, $f2, $f0 -/* D8FD5C 80242B0C 00000000 */ nop -/* D8FD60 80242B10 C6200078 */ lwc1 $f0, 0x78($s1) -/* D8FD64 80242B14 46020000 */ add.s $f0, $f0, $f2 -/* D8FD68 80242B18 E640000C */ swc1 $f0, 0xc($s2) -/* D8FD6C 80242B1C 8E23007C */ lw $v1, 0x7c($s1) -/* D8FD70 80242B20 2402001E */ addiu $v0, $zero, 0x1e -/* D8FD74 80242B24 14620005 */ bne $v1, $v0, .L80242B3C -/* D8FD78 80242B28 24620001 */ addiu $v0, $v1, 1 -/* D8FD7C 80242B2C 24020001 */ addiu $v0, $zero, 1 -/* D8FD80 80242B30 AE220074 */ sw $v0, 0x74($s1) -/* D8FD84 80242B34 08090AE7 */ j .L80242B9C -/* D8FD88 80242B38 AE20007C */ sw $zero, 0x7c($s1) -.L80242B3C: -/* D8FD8C 80242B3C 08090AE7 */ j .L80242B9C -/* D8FD90 80242B40 AE22007C */ sw $v0, 0x7c($s1) -.L80242B44: -/* D8FD94 80242B44 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D8FD98 80242B48 0C00A8D4 */ jal cos_deg -/* D8FD9C 80242B4C 46806320 */ cvt.s.w $f12, $f12 -/* D8FDA0 80242B50 3C014040 */ lui $at, 0x4040 -/* D8FDA4 80242B54 44811000 */ mtc1 $at, $f2 -/* D8FDA8 80242B58 00000000 */ nop -/* D8FDAC 80242B5C 46020002 */ mul.s $f0, $f0, $f2 -/* D8FDB0 80242B60 00000000 */ nop -/* D8FDB4 80242B64 3C014188 */ lui $at, 0x4188 -/* D8FDB8 80242B68 44812000 */ mtc1 $at, $f4 -/* D8FDBC 80242B6C C6220078 */ lwc1 $f2, 0x78($s1) -/* D8FDC0 80242B70 46041080 */ add.s $f2, $f2, $f4 -/* D8FDC4 80242B74 46001080 */ add.s $f2, $f2, $f0 -/* D8FDC8 80242B78 E642000C */ swc1 $f2, 0xc($s2) -/* D8FDCC 80242B7C 8E22007C */ lw $v0, 0x7c($s1) -/* D8FDD0 80242B80 24420009 */ addiu $v0, $v0, 9 -/* D8FDD4 80242B84 44826000 */ mtc1 $v0, $f12 -/* D8FDD8 80242B88 00000000 */ nop -/* D8FDDC 80242B8C 0C00A6C9 */ jal clamp_angle -/* D8FDE0 80242B90 46806320 */ cvt.s.w $f12, $f12 -/* D8FDE4 80242B94 4600018D */ trunc.w.s $f6, $f0 -/* D8FDE8 80242B98 E626007C */ swc1 $f6, 0x7c($s1) -.L80242B9C: -/* D8FDEC 80242B9C 8FBF001C */ lw $ra, 0x1c($sp) -/* D8FDF0 80242BA0 8FB20018 */ lw $s2, 0x18($sp) -/* D8FDF4 80242BA4 8FB10014 */ lw $s1, 0x14($sp) -/* D8FDF8 80242BA8 8FB00010 */ lw $s0, 0x10($sp) -/* D8FDFC 80242BAC 0000102D */ daddu $v0, $zero, $zero -/* D8FE00 80242BB0 03E00008 */ jr $ra -/* D8FE04 80242BB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s deleted file mode 100644 index d500f14c1a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA8_CF9918 -/* CF9918 80241DA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF991C 80241DAC AFB10014 */ sw $s1, 0x14($sp) -/* CF9920 80241DB0 0080882D */ daddu $s1, $a0, $zero -/* CF9924 80241DB4 AFBF001C */ sw $ra, 0x1c($sp) -/* CF9928 80241DB8 AFB20018 */ sw $s2, 0x18($sp) -/* CF992C 80241DBC AFB00010 */ sw $s0, 0x10($sp) -/* CF9930 80241DC0 8E240084 */ lw $a0, 0x84($s1) -/* CF9934 80241DC4 0C04C3D6 */ jal get_item_entity -/* CF9938 80241DC8 00A0802D */ daddu $s0, $a1, $zero -/* CF993C 80241DCC 12000005 */ beqz $s0, .L80241DE4 -/* CF9940 80241DD0 0040902D */ daddu $s2, $v0, $zero -/* CF9944 80241DD4 C640000C */ lwc1 $f0, 0xc($s2) -/* CF9948 80241DD8 AE200074 */ sw $zero, 0x74($s1) -/* CF994C 80241DDC AE20007C */ sw $zero, 0x7c($s1) -/* CF9950 80241DE0 E6200078 */ swc1 $f0, 0x78($s1) -.L80241DE4: -/* CF9954 80241DE4 8E230074 */ lw $v1, 0x74($s1) -/* CF9958 80241DE8 10600005 */ beqz $v1, .L80241E00 -/* CF995C 80241DEC 24020001 */ addiu $v0, $zero, 1 -/* CF9960 80241DF0 10620024 */ beq $v1, $v0, .L80241E84 -/* CF9964 80241DF4 00000000 */ nop -/* CF9968 80241DF8 080907B7 */ j .L80241EDC -/* CF996C 80241DFC 00000000 */ nop -.L80241E00: -/* CF9970 80241E00 3C013FC9 */ lui $at, 0x3fc9 -/* CF9974 80241E04 34210FD8 */ ori $at, $at, 0xfd8 -/* CF9978 80241E08 44810000 */ mtc1 $at, $f0 -/* CF997C 80241E0C C62C007C */ lwc1 $f12, 0x7c($s1) -/* CF9980 80241E10 46806320 */ cvt.s.w $f12, $f12 -/* CF9984 80241E14 46006302 */ mul.s $f12, $f12, $f0 -/* CF9988 80241E18 00000000 */ nop -/* CF998C 80241E1C 3C0141F0 */ lui $at, 0x41f0 -/* CF9990 80241E20 44810000 */ mtc1 $at, $f0 -/* CF9994 80241E24 0C00A874 */ jal cos_rad -/* CF9998 80241E28 46006303 */ div.s $f12, $f12, $f0 -/* CF999C 80241E2C 3C013F80 */ lui $at, 0x3f80 -/* CF99A0 80241E30 44811000 */ mtc1 $at, $f2 -/* CF99A4 80241E34 00000000 */ nop -/* CF99A8 80241E38 46001081 */ sub.s $f2, $f2, $f0 -/* CF99AC 80241E3C 3C0141A0 */ lui $at, 0x41a0 -/* CF99B0 80241E40 44810000 */ mtc1 $at, $f0 -/* CF99B4 80241E44 00000000 */ nop -/* CF99B8 80241E48 46001082 */ mul.s $f2, $f2, $f0 -/* CF99BC 80241E4C 00000000 */ nop -/* CF99C0 80241E50 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF99C4 80241E54 46020000 */ add.s $f0, $f0, $f2 -/* CF99C8 80241E58 E640000C */ swc1 $f0, 0xc($s2) -/* CF99CC 80241E5C 8E23007C */ lw $v1, 0x7c($s1) -/* CF99D0 80241E60 2402001E */ addiu $v0, $zero, 0x1e -/* CF99D4 80241E64 14620005 */ bne $v1, $v0, .L80241E7C -/* CF99D8 80241E68 24620001 */ addiu $v0, $v1, 1 -/* CF99DC 80241E6C 24020001 */ addiu $v0, $zero, 1 -/* CF99E0 80241E70 AE220074 */ sw $v0, 0x74($s1) -/* CF99E4 80241E74 080907B7 */ j .L80241EDC -/* CF99E8 80241E78 AE20007C */ sw $zero, 0x7c($s1) -.L80241E7C: -/* CF99EC 80241E7C 080907B7 */ j .L80241EDC -/* CF99F0 80241E80 AE22007C */ sw $v0, 0x7c($s1) -.L80241E84: -/* CF99F4 80241E84 C62C007C */ lwc1 $f12, 0x7c($s1) -/* CF99F8 80241E88 0C00A8D4 */ jal cos_deg -/* CF99FC 80241E8C 46806320 */ cvt.s.w $f12, $f12 -/* CF9A00 80241E90 3C014040 */ lui $at, 0x4040 -/* CF9A04 80241E94 44811000 */ mtc1 $at, $f2 -/* CF9A08 80241E98 00000000 */ nop -/* CF9A0C 80241E9C 46020002 */ mul.s $f0, $f0, $f2 -/* CF9A10 80241EA0 00000000 */ nop -/* CF9A14 80241EA4 3C014188 */ lui $at, 0x4188 -/* CF9A18 80241EA8 44812000 */ mtc1 $at, $f4 -/* CF9A1C 80241EAC C6220078 */ lwc1 $f2, 0x78($s1) -/* CF9A20 80241EB0 46041080 */ add.s $f2, $f2, $f4 -/* CF9A24 80241EB4 46001080 */ add.s $f2, $f2, $f0 -/* CF9A28 80241EB8 E642000C */ swc1 $f2, 0xc($s2) -/* CF9A2C 80241EBC 8E22007C */ lw $v0, 0x7c($s1) -/* CF9A30 80241EC0 24420009 */ addiu $v0, $v0, 9 -/* CF9A34 80241EC4 44826000 */ mtc1 $v0, $f12 -/* CF9A38 80241EC8 00000000 */ nop -/* CF9A3C 80241ECC 0C00A6C9 */ jal clamp_angle -/* CF9A40 80241ED0 46806320 */ cvt.s.w $f12, $f12 -/* CF9A44 80241ED4 4600018D */ trunc.w.s $f6, $f0 -/* CF9A48 80241ED8 E626007C */ swc1 $f6, 0x7c($s1) -.L80241EDC: -/* CF9A4C 80241EDC 8FBF001C */ lw $ra, 0x1c($sp) -/* CF9A50 80241EE0 8FB20018 */ lw $s2, 0x18($sp) -/* CF9A54 80241EE4 8FB10014 */ lw $s1, 0x14($sp) -/* CF9A58 80241EE8 8FB00010 */ lw $s0, 0x10($sp) -/* CF9A5C 80241EEC 0000102D */ daddu $v0, $zero, $zero -/* CF9A60 80241EF0 03E00008 */ jr $ra -/* CF9A64 80241EF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240118_D37918.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240118_D37918.s deleted file mode 100644 index 5d6b91a0ef..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240118_D37918.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_D37918 -/* D37918 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3791C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* D37920 80240120 0080882D */ daddu $s1, $a0, $zero -/* D37924 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* D37928 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* D3792C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* D37930 80240130 8E240084 */ lw $a0, 0x84($s1) -/* D37934 80240134 0C04C3D6 */ jal get_item_entity -/* D37938 80240138 00A0802D */ daddu $s0, $a1, $zero -/* D3793C 8024013C 12000005 */ beqz $s0, .L80240154 -/* D37940 80240140 0040902D */ daddu $s2, $v0, $zero -/* D37944 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* D37948 80240148 AE200074 */ sw $zero, 0x74($s1) -/* D3794C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* D37950 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* D37954 80240154 8E230074 */ lw $v1, 0x74($s1) -/* D37958 80240158 10600005 */ beqz $v1, .L80240170 -/* D3795C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* D37960 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* D37964 80240164 00000000 */ nop -/* D37968 80240168 08090093 */ j .L8024024C -/* D3796C 8024016C 00000000 */ nop -.L80240170: -/* D37970 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* D37974 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* D37978 80240178 44810000 */ mtc1 $at, $f0 -/* D3797C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* D37980 80240180 46806320 */ cvt.s.w $f12, $f12 -/* D37984 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* D37988 80240188 00000000 */ nop -/* D3798C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* D37990 80240190 44810000 */ mtc1 $at, $f0 -/* D37994 80240194 0C00A874 */ jal cos_rad -/* D37998 80240198 46006303 */ div.s $f12, $f12, $f0 -/* D3799C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* D379A0 802401A0 44811000 */ mtc1 $at, $f2 -/* D379A4 802401A4 00000000 */ nop -/* D379A8 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* D379AC 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* D379B0 802401B0 44810000 */ mtc1 $at, $f0 -/* D379B4 802401B4 00000000 */ nop -/* D379B8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* D379BC 802401BC 00000000 */ nop -/* D379C0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* D379C4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* D379C8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* D379CC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* D379D0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* D379D4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* D379D8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* D379DC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* D379E0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* D379E4 802401E4 08090093 */ j .L8024024C -/* D379E8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* D379EC 802401EC 08090093 */ j .L8024024C -/* D379F0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* D379F4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D379F8 802401F8 0C00A8D4 */ jal cos_deg -/* D379FC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* D37A00 80240200 3C014040 */ lui $at, 0x4040 -/* D37A04 80240204 44811000 */ mtc1 $at, $f2 -/* D37A08 80240208 00000000 */ nop -/* D37A0C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* D37A10 80240210 00000000 */ nop -/* D37A14 80240214 3C014188 */ lui $at, 0x4188 -/* D37A18 80240218 44812000 */ mtc1 $at, $f4 -/* D37A1C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* D37A20 80240220 46041080 */ add.s $f2, $f2, $f4 -/* D37A24 80240224 46001080 */ add.s $f2, $f2, $f0 -/* D37A28 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* D37A2C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* D37A30 80240230 24420009 */ addiu $v0, $v0, 9 -/* D37A34 80240234 44826000 */ mtc1 $v0, $f12 -/* D37A38 80240238 00000000 */ nop -/* D37A3C 8024023C 0C00A6C9 */ jal clamp_angle -/* D37A40 80240240 46806320 */ cvt.s.w $f12, $f12 -/* D37A44 80240244 4600018D */ trunc.w.s $f6, $f0 -/* D37A48 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* D37A4C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* D37A50 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* D37A54 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* D37A58 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* D37A5C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* D37A60 80240260 03E00008 */ jr $ra -/* D37A64 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s deleted file mode 100644 index d6eb629678..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_86CB68 -/* 86CB68 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86CB6C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* 86CB70 80240430 0080882D */ daddu $s1, $a0, $zero -/* 86CB74 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* 86CB78 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* 86CB7C 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* 86CB80 80240440 8E240084 */ lw $a0, 0x84($s1) -/* 86CB84 80240444 0C04C3D6 */ jal get_item_entity -/* 86CB88 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 86CB8C 8024044C 12000005 */ beqz $s0, .L80240464 -/* 86CB90 80240450 0040902D */ daddu $s2, $v0, $zero -/* 86CB94 80240454 C640000C */ lwc1 $f0, 0xc($s2) -/* 86CB98 80240458 AE200074 */ sw $zero, 0x74($s1) -/* 86CB9C 8024045C AE20007C */ sw $zero, 0x7c($s1) -/* 86CBA0 80240460 E6200078 */ swc1 $f0, 0x78($s1) -.L80240464: -/* 86CBA4 80240464 8E230074 */ lw $v1, 0x74($s1) -/* 86CBA8 80240468 10600005 */ beqz $v1, .L80240480 -/* 86CBAC 8024046C 24020001 */ addiu $v0, $zero, 1 -/* 86CBB0 80240470 10620024 */ beq $v1, $v0, .L80240504 -/* 86CBB4 80240474 00000000 */ nop -/* 86CBB8 80240478 08090157 */ j .L8024055C -/* 86CBBC 8024047C 00000000 */ nop -.L80240480: -/* 86CBC0 80240480 3C013FC9 */ lui $at, 0x3fc9 -/* 86CBC4 80240484 34210FD8 */ ori $at, $at, 0xfd8 -/* 86CBC8 80240488 44810000 */ mtc1 $at, $f0 -/* 86CBCC 8024048C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 86CBD0 80240490 46806320 */ cvt.s.w $f12, $f12 -/* 86CBD4 80240494 46006302 */ mul.s $f12, $f12, $f0 -/* 86CBD8 80240498 00000000 */ nop -/* 86CBDC 8024049C 3C0141F0 */ lui $at, 0x41f0 -/* 86CBE0 802404A0 44810000 */ mtc1 $at, $f0 -/* 86CBE4 802404A4 0C00A874 */ jal cos_rad -/* 86CBE8 802404A8 46006303 */ div.s $f12, $f12, $f0 -/* 86CBEC 802404AC 3C013F80 */ lui $at, 0x3f80 -/* 86CBF0 802404B0 44811000 */ mtc1 $at, $f2 -/* 86CBF4 802404B4 00000000 */ nop -/* 86CBF8 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* 86CBFC 802404BC 3C0141A0 */ lui $at, 0x41a0 -/* 86CC00 802404C0 44810000 */ mtc1 $at, $f0 -/* 86CC04 802404C4 00000000 */ nop -/* 86CC08 802404C8 46001082 */ mul.s $f2, $f2, $f0 -/* 86CC0C 802404CC 00000000 */ nop -/* 86CC10 802404D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 86CC14 802404D4 46020000 */ add.s $f0, $f0, $f2 -/* 86CC18 802404D8 E640000C */ swc1 $f0, 0xc($s2) -/* 86CC1C 802404DC 8E23007C */ lw $v1, 0x7c($s1) -/* 86CC20 802404E0 2402001E */ addiu $v0, $zero, 0x1e -/* 86CC24 802404E4 14620005 */ bne $v1, $v0, .L802404FC -/* 86CC28 802404E8 24620001 */ addiu $v0, $v1, 1 -/* 86CC2C 802404EC 24020001 */ addiu $v0, $zero, 1 -/* 86CC30 802404F0 AE220074 */ sw $v0, 0x74($s1) -/* 86CC34 802404F4 08090157 */ j .L8024055C -/* 86CC38 802404F8 AE20007C */ sw $zero, 0x7c($s1) -.L802404FC: -/* 86CC3C 802404FC 08090157 */ j .L8024055C -/* 86CC40 80240500 AE22007C */ sw $v0, 0x7c($s1) -.L80240504: -/* 86CC44 80240504 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 86CC48 80240508 0C00A8D4 */ jal cos_deg -/* 86CC4C 8024050C 46806320 */ cvt.s.w $f12, $f12 -/* 86CC50 80240510 3C014040 */ lui $at, 0x4040 -/* 86CC54 80240514 44811000 */ mtc1 $at, $f2 -/* 86CC58 80240518 00000000 */ nop -/* 86CC5C 8024051C 46020002 */ mul.s $f0, $f0, $f2 -/* 86CC60 80240520 00000000 */ nop -/* 86CC64 80240524 3C014188 */ lui $at, 0x4188 -/* 86CC68 80240528 44812000 */ mtc1 $at, $f4 -/* 86CC6C 8024052C C6220078 */ lwc1 $f2, 0x78($s1) -/* 86CC70 80240530 46041080 */ add.s $f2, $f2, $f4 -/* 86CC74 80240534 46001080 */ add.s $f2, $f2, $f0 -/* 86CC78 80240538 E642000C */ swc1 $f2, 0xc($s2) -/* 86CC7C 8024053C 8E22007C */ lw $v0, 0x7c($s1) -/* 86CC80 80240540 24420009 */ addiu $v0, $v0, 9 -/* 86CC84 80240544 44826000 */ mtc1 $v0, $f12 -/* 86CC88 80240548 00000000 */ nop -/* 86CC8C 8024054C 0C00A6C9 */ jal clamp_angle -/* 86CC90 80240550 46806320 */ cvt.s.w $f12, $f12 -/* 86CC94 80240554 4600018D */ trunc.w.s $f6, $f0 -/* 86CC98 80240558 E626007C */ swc1 $f6, 0x7c($s1) -.L8024055C: -/* 86CC9C 8024055C 8FBF001C */ lw $ra, 0x1c($sp) -/* 86CCA0 80240560 8FB20018 */ lw $s2, 0x18($sp) -/* 86CCA4 80240564 8FB10014 */ lw $s1, 0x14($sp) -/* 86CCA8 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* 86CCAC 8024056C 0000102D */ daddu $v0, $zero, $zero -/* 86CCB0 80240570 03E00008 */ jr $ra -/* 86CCB4 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s deleted file mode 100644 index 08bffd2ae2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240798_875558 -/* 875558 80240798 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87555C 8024079C AFB10014 */ sw $s1, 0x14($sp) -/* 875560 802407A0 0080882D */ daddu $s1, $a0, $zero -/* 875564 802407A4 AFBF001C */ sw $ra, 0x1c($sp) -/* 875568 802407A8 AFB20018 */ sw $s2, 0x18($sp) -/* 87556C 802407AC AFB00010 */ sw $s0, 0x10($sp) -/* 875570 802407B0 8E240084 */ lw $a0, 0x84($s1) -/* 875574 802407B4 0C04C3D6 */ jal get_item_entity -/* 875578 802407B8 00A0802D */ daddu $s0, $a1, $zero -/* 87557C 802407BC 12000005 */ beqz $s0, .L802407D4 -/* 875580 802407C0 0040902D */ daddu $s2, $v0, $zero -/* 875584 802407C4 C640000C */ lwc1 $f0, 0xc($s2) -/* 875588 802407C8 AE200074 */ sw $zero, 0x74($s1) -/* 87558C 802407CC AE20007C */ sw $zero, 0x7c($s1) -/* 875590 802407D0 E6200078 */ swc1 $f0, 0x78($s1) -.L802407D4: -/* 875594 802407D4 8E230074 */ lw $v1, 0x74($s1) -/* 875598 802407D8 10600005 */ beqz $v1, .L802407F0 -/* 87559C 802407DC 24020001 */ addiu $v0, $zero, 1 -/* 8755A0 802407E0 10620024 */ beq $v1, $v0, .L80240874 -/* 8755A4 802407E4 00000000 */ nop -/* 8755A8 802407E8 08090233 */ j .L802408CC -/* 8755AC 802407EC 00000000 */ nop -.L802407F0: -/* 8755B0 802407F0 3C013FC9 */ lui $at, 0x3fc9 -/* 8755B4 802407F4 34210FD8 */ ori $at, $at, 0xfd8 -/* 8755B8 802407F8 44810000 */ mtc1 $at, $f0 -/* 8755BC 802407FC C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8755C0 80240800 46806320 */ cvt.s.w $f12, $f12 -/* 8755C4 80240804 46006302 */ mul.s $f12, $f12, $f0 -/* 8755C8 80240808 00000000 */ nop -/* 8755CC 8024080C 3C0141F0 */ lui $at, 0x41f0 -/* 8755D0 80240810 44810000 */ mtc1 $at, $f0 -/* 8755D4 80240814 0C00A874 */ jal cos_rad -/* 8755D8 80240818 46006303 */ div.s $f12, $f12, $f0 -/* 8755DC 8024081C 3C013F80 */ lui $at, 0x3f80 -/* 8755E0 80240820 44811000 */ mtc1 $at, $f2 -/* 8755E4 80240824 00000000 */ nop -/* 8755E8 80240828 46001081 */ sub.s $f2, $f2, $f0 -/* 8755EC 8024082C 3C0141A0 */ lui $at, 0x41a0 -/* 8755F0 80240830 44810000 */ mtc1 $at, $f0 -/* 8755F4 80240834 00000000 */ nop -/* 8755F8 80240838 46001082 */ mul.s $f2, $f2, $f0 -/* 8755FC 8024083C 00000000 */ nop -/* 875600 80240840 C6200078 */ lwc1 $f0, 0x78($s1) -/* 875604 80240844 46020000 */ add.s $f0, $f0, $f2 -/* 875608 80240848 E640000C */ swc1 $f0, 0xc($s2) -/* 87560C 8024084C 8E23007C */ lw $v1, 0x7c($s1) -/* 875610 80240850 2402001E */ addiu $v0, $zero, 0x1e -/* 875614 80240854 14620005 */ bne $v1, $v0, .L8024086C -/* 875618 80240858 24620001 */ addiu $v0, $v1, 1 -/* 87561C 8024085C 24020001 */ addiu $v0, $zero, 1 -/* 875620 80240860 AE220074 */ sw $v0, 0x74($s1) -/* 875624 80240864 08090233 */ j .L802408CC -/* 875628 80240868 AE20007C */ sw $zero, 0x7c($s1) -.L8024086C: -/* 87562C 8024086C 08090233 */ j .L802408CC -/* 875630 80240870 AE22007C */ sw $v0, 0x7c($s1) -.L80240874: -/* 875634 80240874 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 875638 80240878 0C00A8D4 */ jal cos_deg -/* 87563C 8024087C 46806320 */ cvt.s.w $f12, $f12 -/* 875640 80240880 3C014040 */ lui $at, 0x4040 -/* 875644 80240884 44811000 */ mtc1 $at, $f2 -/* 875648 80240888 00000000 */ nop -/* 87564C 8024088C 46020002 */ mul.s $f0, $f0, $f2 -/* 875650 80240890 00000000 */ nop -/* 875654 80240894 3C014188 */ lui $at, 0x4188 -/* 875658 80240898 44812000 */ mtc1 $at, $f4 -/* 87565C 8024089C C6220078 */ lwc1 $f2, 0x78($s1) -/* 875660 802408A0 46041080 */ add.s $f2, $f2, $f4 -/* 875664 802408A4 46001080 */ add.s $f2, $f2, $f0 -/* 875668 802408A8 E642000C */ swc1 $f2, 0xc($s2) -/* 87566C 802408AC 8E22007C */ lw $v0, 0x7c($s1) -/* 875670 802408B0 24420009 */ addiu $v0, $v0, 9 -/* 875674 802408B4 44826000 */ mtc1 $v0, $f12 -/* 875678 802408B8 00000000 */ nop -/* 87567C 802408BC 0C00A6C9 */ jal clamp_angle -/* 875680 802408C0 46806320 */ cvt.s.w $f12, $f12 -/* 875684 802408C4 4600018D */ trunc.w.s $f6, $f0 -/* 875688 802408C8 E626007C */ swc1 $f6, 0x7c($s1) -.L802408CC: -/* 87568C 802408CC 8FBF001C */ lw $ra, 0x1c($sp) -/* 875690 802408D0 8FB20018 */ lw $s2, 0x18($sp) -/* 875694 802408D4 8FB10014 */ lw $s1, 0x14($sp) -/* 875698 802408D8 8FB00010 */ lw $s0, 0x10($sp) -/* 87569C 802408DC 0000102D */ daddu $v0, $zero, $zero -/* 8756A0 802408E0 03E00008 */ jr $ra -/* 8756A4 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s deleted file mode 100644 index 494c35202a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A78_889648 -/* 889648 80240A78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88964C 80240A7C AFB10014 */ sw $s1, 0x14($sp) -/* 889650 80240A80 0080882D */ daddu $s1, $a0, $zero -/* 889654 80240A84 AFBF001C */ sw $ra, 0x1c($sp) -/* 889658 80240A88 AFB20018 */ sw $s2, 0x18($sp) -/* 88965C 80240A8C AFB00010 */ sw $s0, 0x10($sp) -/* 889660 80240A90 8E240084 */ lw $a0, 0x84($s1) -/* 889664 80240A94 0C04C3D6 */ jal get_item_entity -/* 889668 80240A98 00A0802D */ daddu $s0, $a1, $zero -/* 88966C 80240A9C 12000005 */ beqz $s0, .L80240AB4 -/* 889670 80240AA0 0040902D */ daddu $s2, $v0, $zero -/* 889674 80240AA4 C640000C */ lwc1 $f0, 0xc($s2) -/* 889678 80240AA8 AE200074 */ sw $zero, 0x74($s1) -/* 88967C 80240AAC AE20007C */ sw $zero, 0x7c($s1) -/* 889680 80240AB0 E6200078 */ swc1 $f0, 0x78($s1) -.L80240AB4: -/* 889684 80240AB4 8E230074 */ lw $v1, 0x74($s1) -/* 889688 80240AB8 10600005 */ beqz $v1, .L80240AD0 -/* 88968C 80240ABC 24020001 */ addiu $v0, $zero, 1 -/* 889690 80240AC0 10620024 */ beq $v1, $v0, .L80240B54 -/* 889694 80240AC4 00000000 */ nop -/* 889698 80240AC8 080902EB */ j .L80240BAC -/* 88969C 80240ACC 00000000 */ nop -.L80240AD0: -/* 8896A0 80240AD0 3C013FC9 */ lui $at, 0x3fc9 -/* 8896A4 80240AD4 34210FD8 */ ori $at, $at, 0xfd8 -/* 8896A8 80240AD8 44810000 */ mtc1 $at, $f0 -/* 8896AC 80240ADC C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8896B0 80240AE0 46806320 */ cvt.s.w $f12, $f12 -/* 8896B4 80240AE4 46006302 */ mul.s $f12, $f12, $f0 -/* 8896B8 80240AE8 00000000 */ nop -/* 8896BC 80240AEC 3C0141F0 */ lui $at, 0x41f0 -/* 8896C0 80240AF0 44810000 */ mtc1 $at, $f0 -/* 8896C4 80240AF4 0C00A874 */ jal cos_rad -/* 8896C8 80240AF8 46006303 */ div.s $f12, $f12, $f0 -/* 8896CC 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* 8896D0 80240B00 44811000 */ mtc1 $at, $f2 -/* 8896D4 80240B04 00000000 */ nop -/* 8896D8 80240B08 46001081 */ sub.s $f2, $f2, $f0 -/* 8896DC 80240B0C 3C0141A0 */ lui $at, 0x41a0 -/* 8896E0 80240B10 44810000 */ mtc1 $at, $f0 -/* 8896E4 80240B14 00000000 */ nop -/* 8896E8 80240B18 46001082 */ mul.s $f2, $f2, $f0 -/* 8896EC 80240B1C 00000000 */ nop -/* 8896F0 80240B20 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8896F4 80240B24 46020000 */ add.s $f0, $f0, $f2 -/* 8896F8 80240B28 E640000C */ swc1 $f0, 0xc($s2) -/* 8896FC 80240B2C 8E23007C */ lw $v1, 0x7c($s1) -/* 889700 80240B30 2402001E */ addiu $v0, $zero, 0x1e -/* 889704 80240B34 14620005 */ bne $v1, $v0, .L80240B4C -/* 889708 80240B38 24620001 */ addiu $v0, $v1, 1 -/* 88970C 80240B3C 24020001 */ addiu $v0, $zero, 1 -/* 889710 80240B40 AE220074 */ sw $v0, 0x74($s1) -/* 889714 80240B44 080902EB */ j .L80240BAC -/* 889718 80240B48 AE20007C */ sw $zero, 0x7c($s1) -.L80240B4C: -/* 88971C 80240B4C 080902EB */ j .L80240BAC -/* 889720 80240B50 AE22007C */ sw $v0, 0x7c($s1) -.L80240B54: -/* 889724 80240B54 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 889728 80240B58 0C00A8D4 */ jal cos_deg -/* 88972C 80240B5C 46806320 */ cvt.s.w $f12, $f12 -/* 889730 80240B60 3C014040 */ lui $at, 0x4040 -/* 889734 80240B64 44811000 */ mtc1 $at, $f2 -/* 889738 80240B68 00000000 */ nop -/* 88973C 80240B6C 46020002 */ mul.s $f0, $f0, $f2 -/* 889740 80240B70 00000000 */ nop -/* 889744 80240B74 3C014188 */ lui $at, 0x4188 -/* 889748 80240B78 44812000 */ mtc1 $at, $f4 -/* 88974C 80240B7C C6220078 */ lwc1 $f2, 0x78($s1) -/* 889750 80240B80 46041080 */ add.s $f2, $f2, $f4 -/* 889754 80240B84 46001080 */ add.s $f2, $f2, $f0 -/* 889758 80240B88 E642000C */ swc1 $f2, 0xc($s2) -/* 88975C 80240B8C 8E22007C */ lw $v0, 0x7c($s1) -/* 889760 80240B90 24420009 */ addiu $v0, $v0, 9 -/* 889764 80240B94 44826000 */ mtc1 $v0, $f12 -/* 889768 80240B98 00000000 */ nop -/* 88976C 80240B9C 0C00A6C9 */ jal clamp_angle -/* 889770 80240BA0 46806320 */ cvt.s.w $f12, $f12 -/* 889774 80240BA4 4600018D */ trunc.w.s $f6, $f0 -/* 889778 80240BA8 E626007C */ swc1 $f6, 0x7c($s1) -.L80240BAC: -/* 88977C 80240BAC 8FBF001C */ lw $ra, 0x1c($sp) -/* 889780 80240BB0 8FB20018 */ lw $s2, 0x18($sp) -/* 889784 80240BB4 8FB10014 */ lw $s1, 0x14($sp) -/* 889788 80240BB8 8FB00010 */ lw $s0, 0x10($sp) -/* 88978C 80240BBC 0000102D */ daddu $v0, $zero, $zero -/* 889790 80240BC0 03E00008 */ jr $ra -/* 889794 80240BC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240428_99A098.s b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240428_99A098.s deleted file mode 100644 index f0c8676fe3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240428_99A098.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_99A098 -/* 99A098 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99A09C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* 99A0A0 80240430 0080882D */ daddu $s1, $a0, $zero -/* 99A0A4 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* 99A0A8 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* 99A0AC 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* 99A0B0 80240440 8E240084 */ lw $a0, 0x84($s1) -/* 99A0B4 80240444 0C04C3D6 */ jal get_item_entity -/* 99A0B8 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 99A0BC 8024044C 12000005 */ beqz $s0, .L80240464 -/* 99A0C0 80240450 0040902D */ daddu $s2, $v0, $zero -/* 99A0C4 80240454 C640000C */ lwc1 $f0, 0xc($s2) -/* 99A0C8 80240458 AE200074 */ sw $zero, 0x74($s1) -/* 99A0CC 8024045C AE20007C */ sw $zero, 0x7c($s1) -/* 99A0D0 80240460 E6200078 */ swc1 $f0, 0x78($s1) -.L80240464: -/* 99A0D4 80240464 8E230074 */ lw $v1, 0x74($s1) -/* 99A0D8 80240468 10600005 */ beqz $v1, .L80240480 -/* 99A0DC 8024046C 24020001 */ addiu $v0, $zero, 1 -/* 99A0E0 80240470 10620024 */ beq $v1, $v0, .L80240504 -/* 99A0E4 80240474 00000000 */ nop -/* 99A0E8 80240478 08090157 */ j .L8024055C -/* 99A0EC 8024047C 00000000 */ nop -.L80240480: -/* 99A0F0 80240480 3C013FC9 */ lui $at, 0x3fc9 -/* 99A0F4 80240484 34210FD8 */ ori $at, $at, 0xfd8 -/* 99A0F8 80240488 44810000 */ mtc1 $at, $f0 -/* 99A0FC 8024048C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 99A100 80240490 46806320 */ cvt.s.w $f12, $f12 -/* 99A104 80240494 46006302 */ mul.s $f12, $f12, $f0 -/* 99A108 80240498 00000000 */ nop -/* 99A10C 8024049C 3C0141F0 */ lui $at, 0x41f0 -/* 99A110 802404A0 44810000 */ mtc1 $at, $f0 -/* 99A114 802404A4 0C00A874 */ jal cos_rad -/* 99A118 802404A8 46006303 */ div.s $f12, $f12, $f0 -/* 99A11C 802404AC 3C013F80 */ lui $at, 0x3f80 -/* 99A120 802404B0 44811000 */ mtc1 $at, $f2 -/* 99A124 802404B4 00000000 */ nop -/* 99A128 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* 99A12C 802404BC 3C0141A0 */ lui $at, 0x41a0 -/* 99A130 802404C0 44810000 */ mtc1 $at, $f0 -/* 99A134 802404C4 00000000 */ nop -/* 99A138 802404C8 46001082 */ mul.s $f2, $f2, $f0 -/* 99A13C 802404CC 00000000 */ nop -/* 99A140 802404D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 99A144 802404D4 46020000 */ add.s $f0, $f0, $f2 -/* 99A148 802404D8 E640000C */ swc1 $f0, 0xc($s2) -/* 99A14C 802404DC 8E23007C */ lw $v1, 0x7c($s1) -/* 99A150 802404E0 2402001E */ addiu $v0, $zero, 0x1e -/* 99A154 802404E4 14620005 */ bne $v1, $v0, .L802404FC -/* 99A158 802404E8 24620001 */ addiu $v0, $v1, 1 -/* 99A15C 802404EC 24020001 */ addiu $v0, $zero, 1 -/* 99A160 802404F0 AE220074 */ sw $v0, 0x74($s1) -/* 99A164 802404F4 08090157 */ j .L8024055C -/* 99A168 802404F8 AE20007C */ sw $zero, 0x7c($s1) -.L802404FC: -/* 99A16C 802404FC 08090157 */ j .L8024055C -/* 99A170 80240500 AE22007C */ sw $v0, 0x7c($s1) -.L80240504: -/* 99A174 80240504 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 99A178 80240508 0C00A8D4 */ jal cos_deg -/* 99A17C 8024050C 46806320 */ cvt.s.w $f12, $f12 -/* 99A180 80240510 3C014040 */ lui $at, 0x4040 -/* 99A184 80240514 44811000 */ mtc1 $at, $f2 -/* 99A188 80240518 00000000 */ nop -/* 99A18C 8024051C 46020002 */ mul.s $f0, $f0, $f2 -/* 99A190 80240520 00000000 */ nop -/* 99A194 80240524 3C014188 */ lui $at, 0x4188 -/* 99A198 80240528 44812000 */ mtc1 $at, $f4 -/* 99A19C 8024052C C6220078 */ lwc1 $f2, 0x78($s1) -/* 99A1A0 80240530 46041080 */ add.s $f2, $f2, $f4 -/* 99A1A4 80240534 46001080 */ add.s $f2, $f2, $f0 -/* 99A1A8 80240538 E642000C */ swc1 $f2, 0xc($s2) -/* 99A1AC 8024053C 8E22007C */ lw $v0, 0x7c($s1) -/* 99A1B0 80240540 24420009 */ addiu $v0, $v0, 9 -/* 99A1B4 80240544 44826000 */ mtc1 $v0, $f12 -/* 99A1B8 80240548 00000000 */ nop -/* 99A1BC 8024054C 0C00A6C9 */ jal clamp_angle -/* 99A1C0 80240550 46806320 */ cvt.s.w $f12, $f12 -/* 99A1C4 80240554 4600018D */ trunc.w.s $f6, $f0 -/* 99A1C8 80240558 E626007C */ swc1 $f6, 0x7c($s1) -.L8024055C: -/* 99A1CC 8024055C 8FBF001C */ lw $ra, 0x1c($sp) -/* 99A1D0 80240560 8FB20018 */ lw $s2, 0x18($sp) -/* 99A1D4 80240564 8FB10014 */ lw $s1, 0x14($sp) -/* 99A1D8 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* 99A1DC 8024056C 0000102D */ daddu $v0, $zero, $zero -/* 99A1E0 80240570 03E00008 */ jr $ra -/* 99A1E4 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/include/common_structs.h b/include/common_structs.h index e7a6f8baeb..0b6c3ffb38 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -225,7 +225,10 @@ typedef struct ScriptInstance { /* 0x064 */ struct ScriptInstance* blockingParent; /* parent? */ /* 0x068 */ struct ScriptInstance* childScript; /* 0x06C */ struct ScriptInstance* parentScript; /* brother? */ - /* 0x070 */ s32 functionTemp[4]; + /* 0x070 */ union { + s32 s; + f32 f; + } functionTemp[4]; /* 0x080 */ ApiFunc callFunction; /* 0x084 */ s32 varTable[16]; /* 0x0C4 */ s32 varFlags[3]; diff --git a/include/functions.h b/include/functions.h index c34d160472..ca2f7354c2 100644 --- a/include/functions.h +++ b/include/functions.h @@ -53,6 +53,8 @@ f32 set_float_variable(ScriptInstance* script, Bytecode var, f32 value); void set_script_timescale(ScriptInstance* script, f32 timescale); f32 sin_deg(f32 x); f32 cos_deg(f32 x); +f32 sin_rad(f32 x); +f32 cos_rad(f32 x); s16 round(f32); f32 atan2(f32 startX, f32 startZ, f32 endX, f32 endZ); f32 clamp_angle(f32 theta); diff --git a/src/code_181810.c b/src/code_181810.c index 599c30af1c..8448eecf01 100644 --- a/src/code_181810.c +++ b/src/code_181810.c @@ -59,7 +59,7 @@ ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) { } clamp_printer_coords(gSpeakingActorPrintCtx, screenX, screenY); - script->functionTemp[0] = 0; + script->functionTemp[0].s = 0; D_8009A650[0] |= 0x10; if (gSpeakingActorTalkAnim >= 0) { func_80263E08(actor, part, gSpeakingActorTalkAnim); @@ -67,7 +67,7 @@ ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) { increment_status_menu_disabled(); } - if (script->functionTemp[0] == 0) { + if (script->functionTemp[0].s == 0) { actor = gSpeakingActor; part = gSpeakingActorPart; diff --git a/src/code_1a1f0_len_5390.c b/src/code_1a1f0_len_5390.c index 1a27464d5d..99178293ae 100644 --- a/src/code_1a1f0_len_5390.c +++ b/src/code_1a1f0_len_5390.c @@ -35,13 +35,13 @@ INCLUDE_ASM(s32, "code_1a1f0_len_5390", FadeBackgroundToBlack); ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { - script->functionTemp[0] = 25; + script->functionTemp[0].s = 25; } - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 0xFE); - script->functionTemp[0] -= 5; + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 0xFE); + script->functionTemp[0].s -= 5; - if (script->functionTemp[0] == 0) { + if (script->functionTemp[0].s == 0) { set_background_color_blend(0, 0, 0, 0); return ApiStatus_DONE2; } else { @@ -86,13 +86,13 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; if (isInitialCall) { - script->functionTemp[0] = 0; - script->functionTemp[1] = 40; - script->functionTemp[2] = 0; + script->functionTemp[0].s = 0; + script->functionTemp[1].s = 40; + script->functionTemp[2].s = 0; } - script->functionTemp[2]++; - if (script->functionTemp[2] >= 5) { + script->functionTemp[2].s++; + if (script->functionTemp[2].s >= 5) { if (rand_int(100) < 50) { if (playerData->coins != 0) { playerData->coins--; @@ -100,10 +100,10 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) { playerStatus->position.z, 3, 0, 0); } } - script->functionTemp[2] = 0; + script->functionTemp[2].s = 0; } - return --script->functionTemp[1] == 0; + return --script->functionTemp[1].s == 0; } INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F7CC); diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index 225cf65921..b38715016e 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -132,9 +132,9 @@ INCLUDE_ASM(s32, "code_42e0_len_1f60", _wrap_trig_lookup_value); INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_cos_rad); -INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_rad); +INCLUDE_ASM(f32, "code_42e0_len_1f60", sin_rad, f32 angle); -INCLUDE_ASM(s32, "code_42e0_len_1f60", cos_rad); +INCLUDE_ASM(f32, "code_42e0_len_1f60", cos_rad, f32 angle); INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_cos_deg); diff --git a/src/code_7E2AA0.c b/src/code_7E2AA0.c index 7b0ed8085b..7b711c0be3 100644 --- a/src/code_7E2AA0.c +++ b/src/code_7E2AA0.c @@ -41,17 +41,17 @@ INCLUDE_ASM(s32, "code_7E2AA0", MakeDoorAdvanced); INCLUDE_ASM(s32, "code_7E2AA0", func_802822A8); ApiStatus func_80282314(ScriptInstance* script, s32 isInitialCall) { - script->functionTemp[1] = script->varTable[1]; + script->functionTemp[1].s = script->varTable[1]; return ApiStatus_DONE2; } ApiStatus func_80282324(ScriptInstance* script, s32 isInitialCall) { - script->varTable[0] = *(UNK_TYPE*)script->functionTemp[1]; + script->varTable[0] = *(UNK_TYPE*)script->functionTemp[1].s; return ApiStatus_DONE2; } ApiStatus func_80282338(ScriptInstance* script, s32 isInitialCall) { - UNK_TYPE* temp_s0 = script->functionTemp[1]; + UNK_TYPE* temp_s0 = script->functionTemp[1].s; *temp_s0 = get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; @@ -106,7 +106,7 @@ INCLUDE_ASM(s32, "code_7E2AA0", func_80282634); INCLUDE_ASM(s32, "code_7E2AA0", func_80282700); ApiStatus func_80282774(ScriptInstance* script, s32 isInitialCall) { - DoorStuff* doorStuff = (DoorStuff*)script->functionTemp[1]; + DoorStuff* doorStuff = (DoorStuff*)script->functionTemp[1].s; doorStuff->unk_0A = func_80134240(); func_80134230(doorStuff->unk_08); @@ -114,12 +114,12 @@ ApiStatus func_80282774(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_802827A8(ScriptInstance* script, s32 isInitialCall) { - func_80134230(((DoorStuff*)script->functionTemp[1])->unk_0A); + func_80134230(((DoorStuff*)script->functionTemp[1].s)->unk_0A); return ApiStatus_DONE2; } ApiStatus func_802827CC(ScriptInstance* script, s32 isInitialCall) { - DoorStuff* temp = script->functionTemp[1]; + DoorStuff* temp = script->functionTemp[1].s; script->varTable[2] = temp->unk_04; script->varTable[3] = temp->unk_0C; @@ -139,6 +139,6 @@ ApiStatus func_802827CC(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_80282868(ScriptInstance* script, s32 isInitialCall) { - script->varTable[1] = script->functionTemp[1]; + script->varTable[1] = script->functionTemp[1].s; return ApiStatus_DONE2; } diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c index 1378829e47..92191c1926 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/code_f8f60_len_1560.c @@ -86,9 +86,9 @@ ApiStatus AwaitPlayerApproach(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; - s32* targetX = &script->functionTemp[0]; - s32* targetZ = &script->functionTemp[1]; - s32* distanceRequired = &script->functionTemp[2]; + s32* targetX = &script->functionTemp[0].s; + s32* targetZ = &script->functionTemp[1].s; + s32* distanceRequired = &script->functionTemp[2].s; f32 distance; @@ -114,9 +114,9 @@ ApiStatus IsPlayerWithin(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; - s32* targetX = &script->functionTemp[0]; - s32* targetZ = &script->functionTemp[1]; - s32* distanceRequired = &script->functionTemp[2]; + s32* targetX = &script->functionTemp[0].s; + s32* targetZ = &script->functionTemp[1].s; + s32* distanceRequired = &script->functionTemp[2].s; f32 distance; Bytecode outVar = SI_VAR(0); @@ -145,9 +145,9 @@ ApiStatus AwaitPlayerLeave(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; - s32* targetX = &script->functionTemp[0]; - s32* targetZ = &script->functionTemp[1]; - s32* distanceRequired = &script->functionTemp[2]; + s32* targetX = &script->functionTemp[0].s; + s32* targetZ = &script->functionTemp[1].s; + s32* distanceRequired = &script->functionTemp[2].s; f32 distance; @@ -189,8 +189,8 @@ ApiStatus AddVectorPolar(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { - s32* t0 = &script->functionTemp[0]; - s32* t1 = &script->functionTemp[1]; + s32* t0 = &script->functionTemp[0].s; + s32* t1 = &script->functionTemp[1].s; s32 t1v; if (initialCall) { @@ -217,8 +217,8 @@ ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { } ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) { - s32* t0 = &script->functionTemp[0]; - s32* t1 = &script->functionTemp[1]; + s32* t0 = &script->functionTemp[0].s; + s32* t1 = &script->functionTemp[1].s; s32 t1v; if (initialCall) { diff --git a/src/si.c b/src/si.c index cb40cf7bd8..a99edd61ca 100644 --- a/src/si.c +++ b/src/si.c @@ -88,16 +88,16 @@ ApiStatus si_handle_wait(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; if (!script->blocked) { - script->functionTemp[0] = get_variable(script, *ptrReadPos); + script->functionTemp[0].s = get_variable(script, *ptrReadPos); script->blocked = 1; } - if (script->functionTemp[0]) { + if (script->functionTemp[0].s) { s32 todo = 1; // val can be anything if (todo) { - script->functionTemp[0] -= 1; + script->functionTemp[0].s -= 1; } - return !script->functionTemp[0]; + return !script->functionTemp[0].s; } return ApiStatus_DONE2; } @@ -106,16 +106,16 @@ ApiStatus si_handle_wait_seconds(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; if (!script->blocked) { - script->functionTemp[0] = get_float_variable(script, *ptrReadPos) * 30.0f + 0.5; + script->functionTemp[0].s = get_float_variable(script, *ptrReadPos) * 30.0f + 0.5; script->blocked = 1; } - if (script->functionTemp[0]) { + if (script->functionTemp[0].s != 0) { s32 todo = 1; // val can be anything if (todo) { - script->functionTemp[0] -= 1; + script->functionTemp[0].s -= 1; } - return !script->functionTemp[0]; + return !script->functionTemp[0].s; } return ApiStatus_DONE2; } diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index d95187e8bb..1471fa65ca 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240000_C3D080); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240118_C3D198); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240268_C3D2E8); diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 290f5e2c27..d5b7c68242 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240000_C4DEF0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240118_C4E008); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240268_C4E158); diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index d652a60232..7a74c96951 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_80240FB0_C56EF0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_802410C8_C57008); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", begin_battle_C57158); diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index f37ac70459..deb9883e50 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_802420E8_A3B5C8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242238_A3B718); diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index 3c30e1d264..8139d4e67d 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240118_9865F8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240268_986748); diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index b306af3a9c..88c66109a5 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240118_918CC8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240268_918E18); diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index 0780377183..eb4ec0bf20 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240468_B44BD8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_802405B8_B44D28); diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index 191550cb92..b8158372c1 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240118_AF1D78); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240268_AF1EC8); diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c index b9aab49160..2f097b7bc5 100644 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ b/src/world/area_kkj/kkj_20/AFDB40.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240000_AFDB40); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240118_AFDC58); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240268_AFDDA8); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 4427f98572..c9559e5a2a 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240118_8D85E8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268_8D8738); diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 1764d4f955..6554dd9def 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240498_A57948); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_802405E8_A57A98); diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index dff7d9d370..7667f67e77 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240428_A597B8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240578_A59908); diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c index e3849b332c..45d3806333 100644 --- a/src/world/area_kzn/kzn_08/C71C10.c +++ b/src/world/area_kzn/kzn_08/C71C10.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_802408A8_C71D28); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_802409F8_C71E78); diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index 83afb26a52..fc12fd89b2 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240118_BCED08); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240268_BCEE58); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 794cdb3be1..1f1b8f5d20 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240118_DAD518); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668); diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index 03cd59e30b..f700b956d2 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240988_DB8298); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240AD8_DB83E8); diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index e7ac1f2839..fd8cdb1857 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243038_DC02E8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438); diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index 53c64b2110..580b5ccca3 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240838_DCD508); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240988_DCD658); diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index 48aceba9af..ed8e7fbb17 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241348_DE37D8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241498_DE3928); diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 88d575765a..5923069bbf 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -30,6 +30,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241038_D56BE8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241188_D56D38); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 1489ea67e6..b29e0eb8e5 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -30,6 +30,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80241038_D62538); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80241188_D62688); diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 423fed54fb..36a4a29249 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -32,6 +32,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80241068_D63D78); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_802411B8_D63EC8); diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index e037ade609..0869525b6c 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -30,6 +30,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80241038_D68D38); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80241188_D68E88); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 4005f191c2..bcea4c8d5c 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -32,6 +32,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80241068_D7AA58); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_802411B8_D7ABA8); diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index 01f92bd2f1..f9804c79ff 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -32,6 +32,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80241068_D7C308); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_802411B8_D7C458); diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index 04c522f2bd..66476e5833 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242A68_D8FCB8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242BB8_D8FE08); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 0b80b728b8..7f842bc9bd 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -86,6 +86,6 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800); //#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241D44_CF98B4); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241DA8_CF9918); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241EF8_CF9A68); diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index 53986cd4ce..fee35719cc 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240118_D37918); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240268_D37A68); diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index 26e00c1b52..356fa762d9 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240428_86CB68); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240578_86CCB8); diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index c2e0adf813..3d5e6177df 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240798_875558); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_802408E8_8756A8); diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index 844abbbc80..f03919cbbc 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240A78_889648); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240BC8_889798); diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index 000256dd2b..fb778088de 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240428_99A098); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240578_99A1E8); diff --git a/src/world/common/Bandit_DropCoin.inc.c b/src/world/common/Bandit_DropCoin.inc.c index ae524d9218..2c7c48af82 100644 --- a/src/world/common/Bandit_DropCoin.inc.c +++ b/src/world/common/Bandit_DropCoin.inc.c @@ -20,14 +20,14 @@ static ApiStatus Bandit_DropCoin(ScriptInstance* script, s32 isInitialCall) { npc = npcID; } - script->functionTemp[0] = npc; - script->functionTemp[1] = itemEntityIndex; - script->functionTemp[2] = areaFlag; + script->functionTemp[0].s = npc; + script->functionTemp[1].s = itemEntityIndex; + script->functionTemp[2].s = areaFlag; } - npc = script->functionTemp[0]; - itemEntityIndex = script->functionTemp[1]; - areaFlag = script->functionTemp[2]; + npc = script->functionTemp[0].s; + itemEntityIndex = script->functionTemp[1].s; + areaFlag = script->functionTemp[2].s; if (get_variable(script, areaFlag)) { set_item_entity_position(itemEntityIndex, npc->pos.x, npc->pos.y + 30.0f, npc->pos.z); diff --git a/src/world/common/SomeItemEntityFunc.inc.c b/src/world/common/SomeItemEntityFunc.inc.c new file mode 100644 index 0000000000..a82ee2da08 --- /dev/null +++ b/src/world/common/SomeItemEntityFunc.inc.c @@ -0,0 +1,31 @@ +#include "common.h" + +static ApiStatus SomeItemEntityFunc(ScriptInstance* script, s32 isInitialCall) { + ItemEntity* itemEntity = get_item_entity(script->varTable[0]); + + if (isInitialCall) { + script->functionTemp[2].f = itemEntity->position.y; + script->functionTemp[1].s = 0; + script->functionTemp[3].s = 0; + } + + switch (script->functionTemp[1].s) { + case 0: + itemEntity->position.y = script->functionTemp[2].f + ((1.0f - cos_rad((script->functionTemp[3].s * + (1.570796f)) / 30.0f)) * 20.0f); + if (script->functionTemp[3].s == 30) { + script->functionTemp[1].s = 1; + script->functionTemp[3].s = 0; + } else { + script->functionTemp[3].s++; + } + break; + case 1: + itemEntity->position.y = script->functionTemp[2].f + 17.0f + (cos_deg(script->functionTemp[3].s) * 3.0f); + script->functionTemp[3].s = clamp_angle(script->functionTemp[3].s + 9); + break; + } + + return ApiStatus_BLOCK; +} + diff --git a/src/world/common/UnkTexturePanFunc2.inc.c b/src/world/common/UnkTexturePanFunc2.inc.c index 537aed7048..f173213226 100644 --- a/src/world/common/UnkTexturePanFunc2.inc.c +++ b/src/world/common/UnkTexturePanFunc2.inc.c @@ -2,13 +2,13 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { - script->functionTemp[0] = 0; - script->functionTemp[1] = 0; - script->functionTemp[2] = 0; - script->functionTemp[3] = 0; + script->functionTemp[0].s = 0; + script->functionTemp[1].s = 0; + script->functionTemp[2].s = 0; + script->functionTemp[3].s = 0; } - if (script->functionTemp[0] == 0) { + if (script->functionTemp[0].s == 0) { script->varTable[9] += script->varTable[1]; if (script->varTable[9] < 0) { script->varTable[9] += 0x20000; @@ -17,7 +17,7 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { } } - if (script->functionTemp[1] == 0) { + if (script->functionTemp[1].s == 0) { script->varTable[10] += script->varTable[2]; if (script->varTable[10] < 0) { script->varTable[10] += 0x20000; @@ -26,7 +26,7 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { } } - if (script->functionTemp[2] == 0) { + if (script->functionTemp[2].s == 0) { script->varTable[11] += script->varTable[3]; if (script->varTable[11] < 0) { script->varTable[11] += 0x20000; @@ -35,7 +35,7 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { } } - if (script->functionTemp[3] == 0) { + if (script->functionTemp[3].s == 0) { script->varTable[12] += script->varTable[4]; if (script->varTable[12] < 0) { script->varTable[12] += 0x20000; @@ -49,22 +49,22 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { set_aux_pan_u(script->varTable[0], script->varTable[11]); set_aux_pan_v(script->varTable[0], script->varTable[12]); - script->functionTemp[0]++; - script->functionTemp[1]++; - script->functionTemp[2]++; - script->functionTemp[3]++; + script->functionTemp[0].s++; + script->functionTemp[1].s++; + script->functionTemp[2].s++; + script->functionTemp[3].s++; - if (script->functionTemp[0] >= script->varTable[5]) { - script->functionTemp[0] = 0; + if (script->functionTemp[0].s >= script->varTable[5]) { + script->functionTemp[0].s = 0; } - if (script->functionTemp[1] >= script->varTable[6]) { - script->functionTemp[1] = 0; + if (script->functionTemp[1].s >= script->varTable[6]) { + script->functionTemp[1].s = 0; } - if (script->functionTemp[2] >= script->varTable[7]) { - script->functionTemp[2] = 0; + if (script->functionTemp[2].s >= script->varTable[7]) { + script->functionTemp[2].s = 0; } - if (script->functionTemp[3] >= script->varTable[8]) { - script->functionTemp[3] = 0; + if (script->functionTemp[3].s >= script->varTable[8]) { + script->functionTemp[3].s = 0; } return ApiStatus_BLOCK; }